smartkiosk-server 0.10.8 → 0.10.9

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.
Files changed (4) hide show
  1. data/Gemfile +4 -1
  2. data/Gemfile.lock +21 -15
  3. data/lib/smartkiosk/server/version.rb +1 -1
  4. metadata +5 -2
data/Gemfile CHANGED
@@ -9,7 +9,10 @@ gem 'rails', '3.2.11'
9
9
  gem 'sinatra', :require => nil
10
10
  gem 'jruby-openssl', :platform => :jruby
11
11
 
12
- gem 'activeadmin'
12
+ # The revision contains important fix required to avoid double bootstrap with matrioshka
13
+ # TODO: upgrade to 0.5.2 on release
14
+ gem 'activeadmin', '0.5.1', :git => 'git://github.com/gregbell/active_admin.git', :ref => '4e291e385bdcaa9fee2c37d5a344975101d6f15f'
15
+
13
16
  gem 'activeadmin-cancan'
14
17
  gem 'meta_search', '>= 1.1.0'
15
18
  gem 'russian', '~> 0.6.0'
data/Gemfile.lock CHANGED
@@ -1,3 +1,21 @@
1
+ GIT
2
+ remote: git://github.com/gregbell/active_admin.git
3
+ revision: 4e291e385bdcaa9fee2c37d5a344975101d6f15f
4
+ ref: 4e291e385bdcaa9fee2c37d5a344975101d6f15f
5
+ specs:
6
+ activeadmin (0.5.1)
7
+ arbre (>= 1.0.1)
8
+ bourbon (>= 1.0.0)
9
+ devise (>= 1.1.2)
10
+ fastercsv
11
+ formtastic (>= 2.0.0)
12
+ inherited_resources (>= 1.3.1)
13
+ jquery-rails (>= 1.0.0)
14
+ kaminari (>= 0.13.0)
15
+ meta_search (>= 0.9.2)
16
+ rails (>= 3.0.0)
17
+ sass (>= 3.1.0)
18
+
1
19
  GIT
2
20
  remote: https://github.com/guard/guard-spork.git
3
21
  revision: dbaa8531850347474d5a7ee626a9a2a64f7e653c
@@ -26,18 +44,6 @@ GEM
26
44
  active_attr (0.7.0)
27
45
  activemodel (>= 3.0.2, < 4.1)
28
46
  activesupport (>= 3.0.2, < 4.1)
29
- activeadmin (0.5.1)
30
- arbre (>= 1.0.1)
31
- bourbon (>= 1.0.0)
32
- devise (>= 1.1.2)
33
- fastercsv
34
- formtastic (>= 2.0.0)
35
- inherited_resources (>= 1.3.1)
36
- jquery-rails (>= 1.0.0)
37
- kaminari (>= 0.13.0)
38
- meta_search (>= 0.9.2)
39
- rails (>= 3.0.0)
40
- sass (>= 3.1.0)
41
47
  activeadmin-cancan (0.1.4)
42
48
  activeadmin (>= 0.4.0)
43
49
  cancan (>= 1.6.2)
@@ -80,7 +86,7 @@ GEM
80
86
  erubis (>= 2.7.0)
81
87
  binding_of_caller (0.6.8)
82
88
  bouncy-castle-java (1.5.0146.1)
83
- bourbon (3.0.1)
89
+ bourbon (3.1.0)
84
90
  sass (>= 3.2.0)
85
91
  thor
86
92
  builder (3.0.4)
@@ -125,7 +131,7 @@ GEM
125
131
  nokogiri (>= 1.4.2)
126
132
  rack (>= 1.1.0)
127
133
  uuidtools (~> 2.1.1)
128
- devise (2.2.1)
134
+ devise (2.2.3)
129
135
  bcrypt-ruby (~> 3.0)
130
136
  orm_adapter (~> 0.1)
131
137
  railties (~> 3.1)
@@ -378,7 +384,7 @@ PLATFORMS
378
384
 
379
385
  DEPENDENCIES
380
386
  active_attr
381
- activeadmin
387
+ activeadmin (= 0.5.1)!
382
388
  activeadmin-cancan
383
389
  activerecord-jdbcpostgresql-adapter
384
390
  activerecord-jdbcsqlite3-adapter
data/lib/smartkiosk/server/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Smartkiosk
2
2
  module Server
3
- VERSION = '0.10.8'
3
+ VERSION = '0.10.9'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: smartkiosk-server
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.8
4
+ version: 0.10.9
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -321,13 +321,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
321
321
  version: '0'
322
322
  segments:
323
323
  - 0
324
- hash: 3507042480481956515
324
+ hash: -1984096690378961328
325
325
  required_rubygems_version: !ruby/object:Gem::Requirement
326
326
  none: false
327
327
  requirements:
328
328
  - - ! '>='
329
329
  - !ruby/object:Gem::Version
330
330
  version: '0'
331
+ segments:
332
+ - 0
333
+ hash: -1984096690378961328
331
334
  requirements: []
332
335
  rubyforge_project:
333
336
  rubygems_version: 1.8.23