caboose-cms 0.2.24 → 0.2.25

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTUxZWUzYzkxNGJiYTJkMmFkNTU0YmVhNGQyNWMxNDQxNTBhNTFkMw==
+    YjA1N2I3NjkyNTQ2OGUwM2UwNjEwNmRhNDM0NTU2Y2EwOGFmMDFlMw==
   data.tar.gz: !binary |-
-    ODE3OTQxMmZiZmU0YTlhZWQ5Y2NhM2ViMzYwMDcxYzcwNjIwYzQ2Mg==
+    ODM1ZmVkYTI5ZWRkNWRiZjZiMjRjNDdmYTliNTdhMzgxMGRjYWMzMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmMyY2FhYjJlYmQwNzUzNTg4ZWRjYjE3MmZlODk1MjE2ODBjMDIwMjczZTgx
-    Y2UwZDUyMDkyNDJkY2QyNDRiMTgwMjYwOTBmMWI0M2M4NThiZTQ1ZmIxOWE1
-    YzljNjEwMDVlYWUyOGFkZDY2Mjk4MjM4YTM1ODM0ZGMwYTI3ZDg=
+    NzQ0NTFhOTkyYTE1ZjUwNDM0NWM5ZWRjY2ZlNzU2NTZjYmNlOGQyYmVmYmI0
+    NDBkOGFlYTYxMTBkYzhiYzFjNDg5MTM0ZjU4MTU3MzZiYWI2ZGY0YjdjNzAz
+    NDczNjAzNjFiNDIzMjI1YzU0MjdhYzkyZGJmOGRhYzc3NzU1ODE=
   data.tar.gz: !binary |-
-    YWNlMmExZTJkN2Q3YzdkOGU3NWJiNDk4YWEwYmY4MTQ5NWRmZDdiNDdmNzI2
-    NzI3MzkwODUyYWEzMWFlMmY2MmI5NGFjN2MyNDlhNDljYTQyMGZlYjJlOTI4
-    ZTkzYjY5OTIzZmE1OTBiMmNjOTljMTUzN2U3M2M4YjQyMmUxOTU=
+    ODBkMzc5YmRkYjNhYzI3Y2NjMzQ3NmNlOWU0NDkyMDI3M2EyOGZlZGQyOWJi
+    Nzg0M2UyZmQxMjljOWNlZmUwNWQ3NTNhZTg0NGJhZGQwNjFlOTBiOGE2NGVh
+    NDE0ZmMzMjIwMDc0NjcxNjBhMzBmNzI4NDg2ZDYwZmY3ZjEyZTc=

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.24'
+  VERSION = '0.2.25'
 end

data/lib/tasks/caboose.rake

@@ -39,7 +39,6 @@ namespace :caboose do
   def drop_tables
     puts "Dropping any existing caboose tables..."
     c = ActiveRecord::Base.connection  
-<<<<<<< HEAD
     c.drop_table :users                if c.table_exists?('users')
     c.drop_table :roles                if c.table_exists?('roles')
     c.drop_table :permissions          if c.table_exists?('permissions')
@@ -51,18 +50,6 @@ namespace :caboose do
     c.drop_table :page_permissions     if c.table_exists?('page_permissions')
     c.drop_table :sessions             if c.table_exists?('sessions')
     c.drop_table :settings             if c.table_exists?('settings')
-=======
-    c.drop_table :users             if c.table_exists?('users')
-    c.drop_table :roles             if c.table_exists?('roles')
-    c.drop_table :permissions       if c.table_exists?('permissions')
-    c.drop_table :roles_users       if c.table_exists?('roles_users')
-    c.drop_table :permissions_roles if c.table_exists?('permissions_roles')
-    c.drop_table :assets            if c.table_exists?('assets')
-    c.drop_table :pages             if c.table_exists?('pages')
-    c.drop_table :page_permissions  if c.table_exists?('page_permissions')
-    c.drop_table :sessions          if c.table_exists?('sessions')
-    c.drop_table :settings          if c.table_exists?('settings')
->>>>>>> 91fad24b37b250731136ae37abdd655f03b008e3
   end
 
   def create_tables  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.25
 platform: ruby
 authors:
 - William Barry