Bundle update
This commit is contained in:
parent
59ab1d19cd
commit
864a129e58
55
Gemfile.lock
55
Gemfile.lock
@ -7,7 +7,7 @@ GIT
|
|||||||
|
|
||||||
GIT
|
GIT
|
||||||
remote: git://github.com/gregbell/active_admin.git
|
remote: git://github.com/gregbell/active_admin.git
|
||||||
revision: 9ca081f47ab447793afbd0cb2ba1eded68c26f10
|
revision: ced7d35703bf22a967b0ce66ec9dd2f4bb5ac881
|
||||||
specs:
|
specs:
|
||||||
activeadmin (1.0.0.pre)
|
activeadmin (1.0.0.pre)
|
||||||
arbre (~> 1.0)
|
arbre (~> 1.0)
|
||||||
@ -26,26 +26,26 @@ GIT
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.0.3)
|
actionmailer (4.0.4)
|
||||||
actionpack (= 4.0.3)
|
actionpack (= 4.0.4)
|
||||||
mail (~> 2.5.4)
|
mail (~> 2.5.4)
|
||||||
actionpack (4.0.3)
|
actionpack (4.0.4)
|
||||||
activesupport (= 4.0.3)
|
activesupport (= 4.0.4)
|
||||||
builder (~> 3.1.0)
|
builder (~> 3.1.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rack (~> 1.5.2)
|
rack (~> 1.5.2)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
activemodel (4.0.3)
|
activemodel (4.0.4)
|
||||||
activesupport (= 4.0.3)
|
activesupport (= 4.0.4)
|
||||||
builder (~> 3.1.0)
|
builder (~> 3.1.0)
|
||||||
activerecord (4.0.3)
|
activerecord (4.0.4)
|
||||||
activemodel (= 4.0.3)
|
activemodel (= 4.0.4)
|
||||||
activerecord-deprecated_finders (~> 1.0.2)
|
activerecord-deprecated_finders (~> 1.0.2)
|
||||||
activesupport (= 4.0.3)
|
activesupport (= 4.0.4)
|
||||||
arel (~> 4.0.0)
|
arel (~> 4.0.0)
|
||||||
activerecord-deprecated_finders (1.0.3)
|
activerecord-deprecated_finders (1.0.3)
|
||||||
activesupport (4.0.3)
|
activesupport (4.0.4)
|
||||||
i18n (~> 0.6, >= 0.6.4)
|
i18n (~> 0.6, >= 0.6.9)
|
||||||
minitest (~> 4.2)
|
minitest (~> 4.2)
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
@ -87,7 +87,7 @@ GEM
|
|||||||
railties (>= 3.2.6, < 5)
|
railties (>= 3.2.6, < 5)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
warden (~> 1.2.3)
|
warden (~> 1.2.3)
|
||||||
devise-i18n (0.10.2)
|
devise-i18n (0.10.3)
|
||||||
em-websocket (0.5.0)
|
em-websocket (0.5.0)
|
||||||
eventmachine (>= 0.12.9)
|
eventmachine (>= 0.12.9)
|
||||||
http_parser.rb (~> 0.5.3)
|
http_parser.rb (~> 0.5.3)
|
||||||
@ -149,7 +149,7 @@ GEM
|
|||||||
kaminari (0.15.1)
|
kaminari (0.15.1)
|
||||||
actionpack (>= 3.0.0)
|
actionpack (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
listen (2.7.0)
|
listen (2.7.1)
|
||||||
celluloid (>= 0.15.2)
|
celluloid (>= 0.15.2)
|
||||||
celluloid-io (>= 0.15.0)
|
celluloid-io (>= 0.15.0)
|
||||||
rb-fsevent (>= 0.9.3)
|
rb-fsevent (>= 0.9.3)
|
||||||
@ -178,20 +178,20 @@ GEM
|
|||||||
rack (1.5.2)
|
rack (1.5.2)
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.0.3)
|
rails (4.0.4)
|
||||||
actionmailer (= 4.0.3)
|
actionmailer (= 4.0.4)
|
||||||
actionpack (= 4.0.3)
|
actionpack (= 4.0.4)
|
||||||
activerecord (= 4.0.3)
|
activerecord (= 4.0.4)
|
||||||
activesupport (= 4.0.3)
|
activesupport (= 4.0.4)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.0.3)
|
railties (= 4.0.4)
|
||||||
sprockets-rails (~> 2.0.0)
|
sprockets-rails (~> 2.0.0)
|
||||||
rails-i18n (4.0.1)
|
rails-i18n (4.0.1)
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
rails (~> 4.0)
|
rails (~> 4.0)
|
||||||
railties (4.0.3)
|
railties (4.0.4)
|
||||||
actionpack (= 4.0.3)
|
actionpack (= 4.0.4)
|
||||||
activesupport (= 4.0.3)
|
activesupport (= 4.0.4)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rake (10.1.1)
|
rake (10.1.1)
|
||||||
@ -208,14 +208,15 @@ GEM
|
|||||||
responders (1.0.0)
|
responders (1.0.0)
|
||||||
railties (>= 3.2, < 5)
|
railties (>= 3.2, < 5)
|
||||||
sass (3.2.14)
|
sass (3.2.14)
|
||||||
sass-rails (4.0.1)
|
sass-rails (4.0.2)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
sass (>= 3.1.10)
|
sass (~> 3.2.0)
|
||||||
|
sprockets (~> 2.8, <= 2.11.0)
|
||||||
sprockets-rails (~> 2.0.0)
|
sprockets-rails (~> 2.0.0)
|
||||||
sdoc (0.4.0)
|
sdoc (0.4.0)
|
||||||
json (~> 1.8)
|
json (~> 1.8)
|
||||||
rdoc (~> 4.0, < 5.0)
|
rdoc (~> 4.0, < 5.0)
|
||||||
slop (3.4.7)
|
slop (3.5.0)
|
||||||
sprockets (2.11.0)
|
sprockets (2.11.0)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
@ -236,7 +237,7 @@ GEM
|
|||||||
turbolinks (2.2.1)
|
turbolinks (2.2.1)
|
||||||
coffee-rails
|
coffee-rails
|
||||||
tzinfo (0.3.39)
|
tzinfo (0.3.39)
|
||||||
uglifier (2.4.0)
|
uglifier (2.5.0)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
json (>= 1.8.0)
|
json (>= 1.8.0)
|
||||||
warden (1.2.3)
|
warden (1.2.3)
|
||||||
|
Loading…
Reference in New Issue
Block a user