Bundle update
This commit is contained in:
parent
2904e2f21e
commit
2b9d59b2a2
62
Gemfile.lock
62
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: 0af41dfdcab1f3974814d27d0b6f32929a0c682d
|
revision: 021843bd48627d19ab63a2f08c6d7f12b62c3714
|
||||||
specs:
|
specs:
|
||||||
activeadmin (1.0.0.pre)
|
activeadmin (1.0.0.pre)
|
||||||
arbre (~> 1.0)
|
arbre (~> 1.0)
|
||||||
@ -32,27 +32,27 @@ GIT
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.1.1)
|
actionmailer (4.1.2.rc1)
|
||||||
actionpack (= 4.1.1)
|
actionpack (= 4.1.2.rc1)
|
||||||
actionview (= 4.1.1)
|
actionview (= 4.1.2.rc1)
|
||||||
mail (~> 2.5.4)
|
mail (~> 2.5.4)
|
||||||
actionpack (4.1.1)
|
actionpack (4.1.2.rc1)
|
||||||
actionview (= 4.1.1)
|
actionview (= 4.1.2.rc1)
|
||||||
activesupport (= 4.1.1)
|
activesupport (= 4.1.2.rc1)
|
||||||
rack (~> 1.5.2)
|
rack (~> 1.5.2)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
actionview (4.1.1)
|
actionview (4.1.2.rc1)
|
||||||
activesupport (= 4.1.1)
|
activesupport (= 4.1.2.rc1)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
activemodel (4.1.1)
|
activemodel (4.1.2.rc1)
|
||||||
activesupport (= 4.1.1)
|
activesupport (= 4.1.2.rc1)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.1.1)
|
activerecord (4.1.2.rc1)
|
||||||
activemodel (= 4.1.1)
|
activemodel (= 4.1.2.rc1)
|
||||||
activesupport (= 4.1.1)
|
activesupport (= 4.1.2.rc1)
|
||||||
arel (~> 5.0.0)
|
arel (~> 5.0.0)
|
||||||
activesupport (4.1.1)
|
activesupport (4.1.2.rc1)
|
||||||
i18n (~> 0.6, >= 0.6.9)
|
i18n (~> 0.6, >= 0.6.9)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
@ -98,7 +98,7 @@ GEM
|
|||||||
activemodel
|
activemodel
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
eventmachine (1.0.3)
|
eventmachine (1.0.3)
|
||||||
execjs (2.0.2)
|
execjs (2.1.0)
|
||||||
ffi (1.9.3)
|
ffi (1.9.3)
|
||||||
font-awesome-rails (4.1.0.0)
|
font-awesome-rails (4.1.0.0)
|
||||||
railties (>= 3.2, < 5.0)
|
railties (>= 3.2, < 5.0)
|
||||||
@ -158,7 +158,7 @@ GEM
|
|||||||
celluloid (>= 0.15.2)
|
celluloid (>= 0.15.2)
|
||||||
rb-fsevent (>= 0.9.3)
|
rb-fsevent (>= 0.9.3)
|
||||||
rb-inotify (>= 0.9)
|
rb-inotify (>= 0.9)
|
||||||
lumberjack (1.0.5)
|
lumberjack (1.0.6)
|
||||||
mail (2.5.4)
|
mail (2.5.4)
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
@ -173,7 +173,7 @@ GEM
|
|||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
polyamorous (1.0.0)
|
polyamorous (1.0.0)
|
||||||
activerecord (>= 3.0)
|
activerecord (>= 3.0)
|
||||||
polyglot (0.3.4)
|
polyglot (0.3.5)
|
||||||
pry (0.9.12.6)
|
pry (0.9.12.6)
|
||||||
coderay (~> 1.0)
|
coderay (~> 1.0)
|
||||||
method_source (~> 0.8)
|
method_source (~> 0.8)
|
||||||
@ -183,22 +183,22 @@ 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.1.1)
|
rails (4.1.2.rc1)
|
||||||
actionmailer (= 4.1.1)
|
actionmailer (= 4.1.2.rc1)
|
||||||
actionpack (= 4.1.1)
|
actionpack (= 4.1.2.rc1)
|
||||||
actionview (= 4.1.1)
|
actionview (= 4.1.2.rc1)
|
||||||
activemodel (= 4.1.1)
|
activemodel (= 4.1.2.rc1)
|
||||||
activerecord (= 4.1.1)
|
activerecord (= 4.1.2.rc1)
|
||||||
activesupport (= 4.1.1)
|
activesupport (= 4.1.2.rc1)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.1.1)
|
railties (= 4.1.2.rc1)
|
||||||
sprockets-rails (~> 2.0)
|
sprockets-rails (~> 2.0)
|
||||||
rails-i18n (4.0.2)
|
rails-i18n (4.0.2)
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
rails (>= 4.0)
|
rails (>= 4.0)
|
||||||
railties (4.1.1)
|
railties (4.1.2.rc1)
|
||||||
actionpack (= 4.1.1)
|
actionpack (= 4.1.2.rc1)
|
||||||
activesupport (= 4.1.1)
|
activesupport (= 4.1.2.rc1)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rake (10.3.2)
|
rake (10.3.2)
|
||||||
@ -237,7 +237,7 @@ GEM
|
|||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
sprockets (~> 2.8)
|
sprockets (~> 2.8)
|
||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
thread_safe (0.3.3)
|
thread_safe (0.3.4)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
timers (1.1.0)
|
timers (1.1.0)
|
||||||
treetop (1.4.15)
|
treetop (1.4.15)
|
||||||
@ -245,7 +245,7 @@ GEM
|
|||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
turbolinks (2.2.2)
|
turbolinks (2.2.2)
|
||||||
coffee-rails
|
coffee-rails
|
||||||
tzinfo (1.1.0)
|
tzinfo (1.2.0)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (2.5.0)
|
uglifier (2.5.0)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
|
Loading…
Reference in New Issue
Block a user