rocket_cms 0.6.15 → 0.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5b4d282e300551acf67404e3ff98f02e19e230f
-  data.tar.gz: 2fa4221986546ce334e7ea03c6f0858ed0286f20
+  metadata.gz: 129c5e1f7b72e2bfb91cd533f6fb41457d01cbed
+  data.tar.gz: b507a570511479bae72da94a433bdffb2ee33be9
 SHA512:
-  metadata.gz: 919c93acaf4391f976da51bf92b4ef72daafe8b228d4d742eda4319dd887b3113c78374731bc0c3bd4228563daf1a271a84e2d3eddff5f0e985311a0df5a3829
-  data.tar.gz: 18ac989b2d37bf2cf3a8b381fef0043eb20dd07b0b2256f5c0d06ce4d336eb7f045460d4ae6de3669dc99541012f608dd912fe97b4ab8071f18570d6badf3984
+  metadata.gz: e5d0a597b1bf2042b421dc9d25fc9d52ab29fa1e9cd2d9944e58c2f61fb55b3f6e1f27007d8c80925f197af70f98a7488bacc7fec7b6604432dfc2e810337c01
+  data.tar.gz: 3ef4040760a5ab69c73c8a928d989f8317876b0b614d57535150460ef3ddcc927cc65a011827f2132914f4baeee73260c002c524c1062dfb5b9fc5e1ee5ebd87

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.6.15)
+    rocket_cms (0.6.16)
       addressable
       coffee-rails
       devise
@@ -69,10 +69,10 @@ GEM
     coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1)
+    coffee-script-source (1.9.1.1)
     devise (3.4.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -81,7 +81,7 @@ GEM
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     erubis (2.7.0)
-    execjs (2.4.0)
+    execjs (2.5.2)
     font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
     geocoder (1.2.8)
@@ -91,11 +91,10 @@ GEM
       orm_adapter (~> 0.5.0)
       rails (~> 4.0)
     glebtv-simple_captcha (0.6.7)
-    globalid (0.3.3)
+    globalid (0.3.5)
       activesupport (>= 4.1.0)
     haml (4.0.6)
       tilt
-    hike (1.2.3)
     htmlentities (4.3.3)
     i18n (0.7.0)
     jquery-rails (4.0.3)
@@ -113,10 +112,9 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.4.3)
-    mini_magick (4.2.0)
+    mini_magick (4.2.3)
     mini_portile (0.6.2)
-    minitest (5.5.1)
-    multi_json (1.11.0)
+    minitest (5.6.0)
     nested_form (0.3.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
@@ -182,7 +180,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
-    simple-navigation (4.0.1)
+    simple-navigation (4.0.3)
       activesupport (>= 2.3.2)
     simple_form (3.1.0)
       actionpack (~> 4.0)
@@ -192,11 +190,8 @@ GEM
     smart_excerpt (0.1.5)
       activesupport
       htmlentities
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    sprockets (3.0.1)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
     sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)

data/app/controllers/concerns/rs_errors.rb

@@ -59,6 +59,6 @@ module RsErrors
   end
 
   def rails_admin?
-    self.is_a?(RailsAdmin::ApplicationController)
+    self.is_a?(RailsAdmin::ApplicationController) || self.is_a?(RailsAdmin::MainController)
   end
 end

data/app/controllers/concerns/rs_pages.rb

@@ -7,6 +7,7 @@ module RsPages
   private
 
   def find_page
+    return if rails_admin?
     @seo_page = find_seo_page request.path
     if !@seo_page.nil? && !@seo_page.redirect.blank?
       redirect_to @seo_page.redirect, status: :moved_permanently
@@ -38,4 +39,7 @@ module RsPages
     page
   end
 
+  def rails_admin?
+    self.is_a?(RailsAdmin::ApplicationController) || self.is_a?(RailsAdmin::MainController)
+  end
 end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.6.15"
+  VERSION = "0.6.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.6.16
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler