caboose-cms 0.2.24 → 0.2.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- YTUxZWUzYzkxNGJiYTJkMmFkNTU0YmVhNGQyNWMxNDQxNTBhNTFkMw==
4
+ YjA1N2I3NjkyNTQ2OGUwM2UwNjEwNmRhNDM0NTU2Y2EwOGFmMDFlMw==
5
5
  data.tar.gz: !binary |-
6
- ODE3OTQxMmZiZmU0YTlhZWQ5Y2NhM2ViMzYwMDcxYzcwNjIwYzQ2Mg==
6
+ ODM1ZmVkYTI5ZWRkNWRiZjZiMjRjNDdmYTliNTdhMzgxMGRjYWMzMQ==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- ZmMyY2FhYjJlYmQwNzUzNTg4ZWRjYjE3MmZlODk1MjE2ODBjMDIwMjczZTgx
10
- Y2UwZDUyMDkyNDJkY2QyNDRiMTgwMjYwOTBmMWI0M2M4NThiZTQ1ZmIxOWE1
11
- YzljNjEwMDVlYWUyOGFkZDY2Mjk4MjM4YTM1ODM0ZGMwYTI3ZDg=
9
+ NzQ0NTFhOTkyYTE1ZjUwNDM0NWM5ZWRjY2ZlNzU2NTZjYmNlOGQyYmVmYmI0
10
+ NDBkOGFlYTYxMTBkYzhiYzFjNDg5MTM0ZjU4MTU3MzZiYWI2ZGY0YjdjNzAz
11
+ NDczNjAzNjFiNDIzMjI1YzU0MjdhYzkyZGJmOGRhYzc3NzU1ODE=
12
12
  data.tar.gz: !binary |-
13
- YWNlMmExZTJkN2Q3YzdkOGU3NWJiNDk4YWEwYmY4MTQ5NWRmZDdiNDdmNzI2
14
- NzI3MzkwODUyYWEzMWFlMmY2MmI5NGFjN2MyNDlhNDljYTQyMGZlYjJlOTI4
15
- ZTkzYjY5OTIzZmE1OTBiMmNjOTljMTUzN2U3M2M4YjQyMmUxOTU=
13
+ ODBkMzc5YmRkYjNhYzI3Y2NjMzQ3NmNlOWU0NDkyMDI3M2EyOGZlZGQyOWJi
14
+ Nzg0M2UyZmQxMjljOWNlZmUwNWQ3NTNhZTg0NGJhZGQwNjFlOTBiOGE2NGVh
15
+ NDE0ZmMzMjIwMDc0NjcxNjBhMzBmNzI4NDg2ZDYwZmY3ZjEyZTc=
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.2.24'
2
+ VERSION = '0.2.25'
3
3
  end
@@ -39,7 +39,6 @@ namespace :caboose do
39
39
  def drop_tables
40
40
  puts "Dropping any existing caboose tables..."
41
41
  c = ActiveRecord::Base.connection
42
- <<<<<<< HEAD
43
42
  c.drop_table :users if c.table_exists?('users')
44
43
  c.drop_table :roles if c.table_exists?('roles')
45
44
  c.drop_table :permissions if c.table_exists?('permissions')
@@ -51,18 +50,6 @@ namespace :caboose do
51
50
  c.drop_table :page_permissions if c.table_exists?('page_permissions')
52
51
  c.drop_table :sessions if c.table_exists?('sessions')
53
52
  c.drop_table :settings if c.table_exists?('settings')
54
- =======
55
- c.drop_table :users if c.table_exists?('users')
56
- c.drop_table :roles if c.table_exists?('roles')
57
- c.drop_table :permissions if c.table_exists?('permissions')
58
- c.drop_table :roles_users if c.table_exists?('roles_users')
59
- c.drop_table :permissions_roles if c.table_exists?('permissions_roles')
60
- c.drop_table :assets if c.table_exists?('assets')
61
- c.drop_table :pages if c.table_exists?('pages')
62
- c.drop_table :page_permissions if c.table_exists?('page_permissions')
63
- c.drop_table :sessions if c.table_exists?('sessions')
64
- c.drop_table :settings if c.table_exists?('settings')
65
- >>>>>>> 91fad24b37b250731136ae37abdd655f03b008e3
66
53
  end
67
54
 
68
55
  def create_tables
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.24
4
+ version: 0.2.25
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry