Bundle updated
This commit is contained in:
parent
12b3be983e
commit
a2f27a6e3f
34
Gemfile.lock
34
Gemfile.lock
@ -1,12 +1,12 @@
|
||||
GIT
|
||||
remote: git://github.com/gregbell/active_admin.git
|
||||
revision: 81af5ec7e3ee780f5bf170938fc64e36e96adfe6
|
||||
revision: 03c7bc771bf7b166de64848f2dae92368dad6b46
|
||||
specs:
|
||||
activeadmin (1.0.0.pre)
|
||||
arbre (~> 1.0)
|
||||
bourbon
|
||||
coffee-rails
|
||||
devise (~> 3.0)
|
||||
devise (~> 3.2)
|
||||
formtastic (~> 2.3.0.rc2)
|
||||
inherited_resources (~> 1.3)
|
||||
jquery-rails
|
||||
@ -89,7 +89,7 @@ GEM
|
||||
formtastic (2.3.0.rc2)
|
||||
actionpack (>= 3.0)
|
||||
fssm (0.2.10)
|
||||
guard (2.2.4)
|
||||
guard (2.2.5)
|
||||
formatador (>= 0.2.4)
|
||||
listen (~> 2.1)
|
||||
lumberjack (~> 1.0)
|
||||
@ -102,16 +102,16 @@ GEM
|
||||
em-websocket (~> 0.5)
|
||||
guard (~> 2.0)
|
||||
multi_json (~> 1.8)
|
||||
guard-minitest (2.1.2)
|
||||
guard-minitest (2.1.3)
|
||||
guard (~> 2.0)
|
||||
minitest (>= 3.0)
|
||||
haml (4.0.4)
|
||||
tilt
|
||||
haml-rails (0.5.2)
|
||||
actionpack (~> 4.0.1)
|
||||
activesupport (~> 4.0.1)
|
||||
haml-rails (0.5.3)
|
||||
actionpack (>= 4.0.1)
|
||||
activesupport (>= 4.0.1)
|
||||
haml (>= 3.1, < 5.0)
|
||||
railties (~> 4.0.1)
|
||||
railties (>= 4.0.1)
|
||||
has_scope (0.6.0.rc)
|
||||
actionpack (>= 3.2, < 5)
|
||||
activesupport (>= 3.2, < 5)
|
||||
@ -121,7 +121,7 @@ GEM
|
||||
inherited_resources (1.4.1)
|
||||
has_scope (~> 0.6.0.rc)
|
||||
responders (~> 1.0.0.rc)
|
||||
jbuilder (1.5.3)
|
||||
jbuilder (2.0.1)
|
||||
activesupport (>= 3.0.0)
|
||||
multi_json (>= 1.2.0)
|
||||
jquery-rails (3.0.4)
|
||||
@ -130,7 +130,7 @@ GEM
|
||||
jquery-turbolinks (2.0.1)
|
||||
railties (>= 3.1.0)
|
||||
turbolinks
|
||||
jquery-ui-rails (4.1.0)
|
||||
jquery-ui-rails (4.1.1)
|
||||
railties (>= 3.1.0)
|
||||
json (1.8.1)
|
||||
kaminari (0.15.0)
|
||||
@ -168,27 +168,27 @@ GEM
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.2)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
rails-i18n (4.0.0)
|
||||
rails-i18n (4.0.1)
|
||||
i18n (~> 0.6)
|
||||
rails (~> 4.0.0)
|
||||
rails (~> 4.0)
|
||||
railties (4.0.2)
|
||||
actionpack (= 4.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.1.0)
|
||||
rake (10.1.1)
|
||||
ransack (1.1.0)
|
||||
actionpack (>= 3.0)
|
||||
activerecord (>= 3.0)
|
||||
polyamorous (~> 0.6.0)
|
||||
rb-fsevent (0.9.3)
|
||||
rb-inotify (0.9.2)
|
||||
rb-inotify (0.9.3)
|
||||
ffi (>= 0.5.0)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
responders (1.0.0)
|
||||
railties (>= 3.2, < 5)
|
||||
sass (3.2.12)
|
||||
sass (3.2.13)
|
||||
sass-rails (4.0.1)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (>= 3.1.10)
|
||||
@ -214,10 +214,10 @@ GEM
|
||||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
turbolinks (2.0.0)
|
||||
turbolinks (2.1.0)
|
||||
coffee-rails
|
||||
tzinfo (0.3.38)
|
||||
uglifier (2.3.2)
|
||||
uglifier (2.4.0)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
warden (1.2.3)
|
||||
|
Loading…
Reference in New Issue
Block a user