Bundle update
This commit is contained in:
parent
83d471ddda
commit
f405e046e9
68
Gemfile.lock
68
Gemfile.lock
@ -1,9 +1,9 @@
|
|||||||
GIT
|
GIT
|
||||||
remote: git://github.com/gregbell/active_admin.git
|
remote: git://github.com/gregbell/active_admin.git
|
||||||
revision: b8e89c74788199d383963267f4735dccbf292f20
|
revision: 35f2f8a934fe3fc3f35bac9d7e8b624d9236e04d
|
||||||
specs:
|
specs:
|
||||||
activeadmin (1.0.0.pre)
|
activeadmin (1.0.0.pre)
|
||||||
arbre (~> 1.0)
|
arbre (~> 1.0, >= 1.0.2)
|
||||||
bourbon
|
bourbon
|
||||||
coffee-rails
|
coffee-rails
|
||||||
formtastic (~> 2.3.0.rc3)
|
formtastic (~> 2.3.0.rc3)
|
||||||
@ -25,37 +25,37 @@ GIT
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.1.4)
|
actionmailer (4.1.5)
|
||||||
actionpack (= 4.1.4)
|
actionpack (= 4.1.5)
|
||||||
actionview (= 4.1.4)
|
actionview (= 4.1.5)
|
||||||
mail (~> 2.5.4)
|
mail (~> 2.5.4)
|
||||||
actionpack (4.1.4)
|
actionpack (4.1.5)
|
||||||
actionview (= 4.1.4)
|
actionview (= 4.1.5)
|
||||||
activesupport (= 4.1.4)
|
activesupport (= 4.1.5)
|
||||||
rack (~> 1.5.2)
|
rack (~> 1.5.2)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
actionview (4.1.4)
|
actionview (4.1.5)
|
||||||
activesupport (= 4.1.4)
|
activesupport (= 4.1.5)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
actionview-encoded_mail_to (1.0.4)
|
actionview-encoded_mail_to (1.0.4)
|
||||||
rails
|
rails
|
||||||
activeadmin_pagedown (0.0.2)
|
activeadmin_pagedown (0.0.2)
|
||||||
activeadmin (>= 0.5.0)
|
activeadmin (>= 0.5.0)
|
||||||
activemodel (4.1.4)
|
activemodel (4.1.5)
|
||||||
activesupport (= 4.1.4)
|
activesupport (= 4.1.5)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.1.4)
|
activerecord (4.1.5)
|
||||||
activemodel (= 4.1.4)
|
activemodel (= 4.1.5)
|
||||||
activesupport (= 4.1.4)
|
activesupport (= 4.1.5)
|
||||||
arel (~> 5.0.0)
|
arel (~> 5.0.0)
|
||||||
activesupport (4.1.4)
|
activesupport (4.1.5)
|
||||||
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)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
arbre (1.0.1)
|
arbre (1.0.2)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
arel (5.0.1.20140414130214)
|
arel (5.0.1.20140414130214)
|
||||||
ast (2.0.0)
|
ast (2.0.0)
|
||||||
@ -63,13 +63,13 @@ GEM
|
|||||||
bourbon (3.2.3)
|
bourbon (3.2.3)
|
||||||
sass (~> 3.2)
|
sass (~> 3.2)
|
||||||
thor
|
thor
|
||||||
brakeman (2.6.1)
|
brakeman (2.6.2)
|
||||||
erubis (~> 2.6)
|
erubis (~> 2.6)
|
||||||
fastercsv (~> 1.5)
|
fastercsv (~> 1.5)
|
||||||
haml (>= 3.0, < 5.0)
|
haml (>= 3.0, < 5.0)
|
||||||
highline (~> 1.6.20)
|
highline (~> 1.6.20)
|
||||||
multi_json (~> 1.2)
|
multi_json (~> 1.2)
|
||||||
ruby2ruby (~> 2.0.5)
|
ruby2ruby (~> 2.1.1)
|
||||||
ruby_parser (~> 3.5.0)
|
ruby_parser (~> 3.5.0)
|
||||||
sass (~> 3.0)
|
sass (~> 3.0)
|
||||||
slim (>= 1.3.6, < 3.0)
|
slim (>= 1.3.6, < 3.0)
|
||||||
@ -98,7 +98,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.4)
|
devise-i18n (0.11.0)
|
||||||
differ (0.1.2)
|
differ (0.1.2)
|
||||||
em-websocket (0.5.1)
|
em-websocket (0.5.1)
|
||||||
eventmachine (>= 0.12.9)
|
eventmachine (>= 0.12.9)
|
||||||
@ -205,22 +205,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.4)
|
rails (4.1.5)
|
||||||
actionmailer (= 4.1.4)
|
actionmailer (= 4.1.5)
|
||||||
actionpack (= 4.1.4)
|
actionpack (= 4.1.5)
|
||||||
actionview (= 4.1.4)
|
actionview (= 4.1.5)
|
||||||
activemodel (= 4.1.4)
|
activemodel (= 4.1.5)
|
||||||
activerecord (= 4.1.4)
|
activerecord (= 4.1.5)
|
||||||
activesupport (= 4.1.4)
|
activesupport (= 4.1.5)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.1.4)
|
railties (= 4.1.5)
|
||||||
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.4)
|
railties (4.1.5)
|
||||||
actionpack (= 4.1.4)
|
actionpack (= 4.1.5)
|
||||||
activesupport (= 4.1.4)
|
activesupport (= 4.1.5)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rainbow (2.0.0)
|
rainbow (2.0.0)
|
||||||
@ -246,7 +246,7 @@ GEM
|
|||||||
rainbow (>= 1.99.1, < 3.0)
|
rainbow (>= 1.99.1, < 3.0)
|
||||||
ruby-progressbar (~> 1.4)
|
ruby-progressbar (~> 1.4)
|
||||||
ruby-progressbar (1.5.1)
|
ruby-progressbar (1.5.1)
|
||||||
ruby2ruby (2.0.8)
|
ruby2ruby (2.1.1)
|
||||||
ruby_parser (~> 3.1)
|
ruby_parser (~> 3.1)
|
||||||
sexp_processor (~> 4.0)
|
sexp_processor (~> 4.0)
|
||||||
ruby_parser (3.5.0)
|
ruby_parser (3.5.0)
|
||||||
@ -260,7 +260,7 @@ GEM
|
|||||||
sdoc (0.4.1)
|
sdoc (0.4.1)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
rdoc (~> 4.0)
|
rdoc (~> 4.0)
|
||||||
select2-rails (3.5.9)
|
select2-rails (3.5.9.1)
|
||||||
thor (~> 0.14)
|
thor (~> 0.14)
|
||||||
sexp_processor (4.4.4)
|
sexp_processor (4.4.4)
|
||||||
simple_calendar (1.1.5)
|
simple_calendar (1.1.5)
|
||||||
@ -296,7 +296,7 @@ GEM
|
|||||||
treetop (1.4.15)
|
treetop (1.4.15)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
turbolinks (2.2.2)
|
turbolinks (2.3.0)
|
||||||
coffee-rails
|
coffee-rails
|
||||||
tzinfo (1.2.2)
|
tzinfo (1.2.2)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
|
Loading…
Reference in New Issue
Block a user