smartkiosk-server 0.10.8 → 0.10.9

data/Gemfile

@@ -9,7 +9,10 @@ gem 'rails', '3.2.11'
 gem 'sinatra', :require => nil
 gem 'jruby-openssl', :platform => :jruby
 
-gem 'activeadmin'
+# The revision contains important fix required to avoid double bootstrap with matrioshka
+# TODO: upgrade to 0.5.2 on release
+gem 'activeadmin', '0.5.1', :git => 'git://github.com/gregbell/active_admin.git', :ref => '4e291e385bdcaa9fee2c37d5a344975101d6f15f'
+
 gem 'activeadmin-cancan'
 gem 'meta_search', '>= 1.1.0'
 gem 'russian', '~> 0.6.0'

data/Gemfile.lock

@@ -1,3 +1,21 @@
+GIT
+  remote: git://github.com/gregbell/active_admin.git
+  revision: 4e291e385bdcaa9fee2c37d5a344975101d6f15f
+  ref: 4e291e385bdcaa9fee2c37d5a344975101d6f15f
+  specs:
+    activeadmin (0.5.1)
+      arbre (>= 1.0.1)
+      bourbon (>= 1.0.0)
+      devise (>= 1.1.2)
+      fastercsv
+      formtastic (>= 2.0.0)
+      inherited_resources (>= 1.3.1)
+      jquery-rails (>= 1.0.0)
+      kaminari (>= 0.13.0)
+      meta_search (>= 0.9.2)
+      rails (>= 3.0.0)
+      sass (>= 3.1.0)
+
 GIT
   remote: https://github.com/guard/guard-spork.git
   revision: dbaa8531850347474d5a7ee626a9a2a64f7e653c
@@ -26,18 +44,6 @@ GEM
     active_attr (0.7.0)
       activemodel (>= 3.0.2, < 4.1)
       activesupport (>= 3.0.2, < 4.1)
-    activeadmin (0.5.1)
-      arbre (>= 1.0.1)
-      bourbon (>= 1.0.0)
-      devise (>= 1.1.2)
-      fastercsv
-      formtastic (>= 2.0.0)
-      inherited_resources (>= 1.3.1)
-      jquery-rails (>= 1.0.0)
-      kaminari (>= 0.13.0)
-      meta_search (>= 0.9.2)
-      rails (>= 3.0.0)
-      sass (>= 3.1.0)
     activeadmin-cancan (0.1.4)
       activeadmin (>= 0.4.0)
       cancan (>= 1.6.2)
@@ -80,7 +86,7 @@ GEM
       erubis (>= 2.7.0)
     binding_of_caller (0.6.8)
     bouncy-castle-java (1.5.0146.1)
-    bourbon (3.0.1)
+    bourbon (3.1.0)
       sass (>= 3.2.0)
       thor
     builder (3.0.4)
@@ -125,7 +131,7 @@ GEM
       nokogiri (>= 1.4.2)
       rack (>= 1.1.0)
       uuidtools (~> 2.1.1)
-    devise (2.2.1)
+    devise (2.2.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
@@ -378,7 +384,7 @@ PLATFORMS
 
 DEPENDENCIES
   active_attr
-  activeadmin
+  activeadmin (= 0.5.1)!
   activeadmin-cancan
   activerecord-jdbcpostgresql-adapter
   activerecord-jdbcsqlite3-adapter

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.10.8'
+    VERSION = '0.10.9'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.10.8
+  version: 0.10.9
   prerelease: 
 platform: ruby
 authors:
@@ -321,13 +321,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3507042480481956515
+      hash: -1984096690378961328
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1984096690378961328
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23