Bundle update
This commit is contained in:
parent
af1176bf47
commit
54319565d6
62
Gemfile.lock
62
Gemfile.lock
@ -1,6 +1,6 @@
|
||||
GIT
|
||||
remote: git://github.com/gregbell/active_admin.git
|
||||
revision: 0e0b3694bace985f355135f9628ea7918c3695d2
|
||||
revision: 2ae0a9e09bf9fab7fd95e245b6c46d5c7fc2a953
|
||||
specs:
|
||||
activeadmin (1.0.0.pre)
|
||||
arbre (~> 1.0)
|
||||
@ -25,29 +25,29 @@ GIT
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.1.2)
|
||||
actionpack (= 4.1.2)
|
||||
actionview (= 4.1.2)
|
||||
actionmailer (4.1.4)
|
||||
actionpack (= 4.1.4)
|
||||
actionview (= 4.1.4)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (4.1.2)
|
||||
actionview (= 4.1.2)
|
||||
activesupport (= 4.1.2)
|
||||
actionpack (4.1.4)
|
||||
actionview (= 4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
actionview (4.1.2)
|
||||
activesupport (= 4.1.2)
|
||||
actionview (4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
actionview-encoded_mail_to (1.0.4)
|
||||
rails
|
||||
activemodel (4.1.2)
|
||||
activesupport (= 4.1.2)
|
||||
activemodel (4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.1.2)
|
||||
activemodel (= 4.1.2)
|
||||
activesupport (= 4.1.2)
|
||||
activerecord (4.1.4)
|
||||
activemodel (= 4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
arel (~> 5.0.0)
|
||||
activesupport (4.1.2)
|
||||
activesupport (4.1.4)
|
||||
i18n (~> 0.6, >= 0.6.9)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
@ -60,7 +60,7 @@ GEM
|
||||
bourbon (3.2.3)
|
||||
sass (~> 3.2)
|
||||
thor
|
||||
brakeman (2.6.0)
|
||||
brakeman (2.6.1)
|
||||
erubis (~> 2.6)
|
||||
fastercsv (~> 1.5)
|
||||
haml (>= 3.0, < 5.0)
|
||||
@ -159,7 +159,7 @@ GEM
|
||||
jquery-turbolinks (2.0.2)
|
||||
railties (>= 3.1.0)
|
||||
turbolinks
|
||||
jquery-ui-rails (4.2.1)
|
||||
jquery-ui-rails (5.0.0)
|
||||
railties (>= 3.2.16)
|
||||
json (1.8.1)
|
||||
kaminari (0.16.1)
|
||||
@ -195,22 +195,22 @@ GEM
|
||||
rack (1.5.2)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (4.1.2)
|
||||
actionmailer (= 4.1.2)
|
||||
actionpack (= 4.1.2)
|
||||
actionview (= 4.1.2)
|
||||
activemodel (= 4.1.2)
|
||||
activerecord (= 4.1.2)
|
||||
activesupport (= 4.1.2)
|
||||
rails (4.1.4)
|
||||
actionmailer (= 4.1.4)
|
||||
actionpack (= 4.1.4)
|
||||
actionview (= 4.1.4)
|
||||
activemodel (= 4.1.4)
|
||||
activerecord (= 4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.1.2)
|
||||
railties (= 4.1.4)
|
||||
sprockets-rails (~> 2.0)
|
||||
rails-i18n (4.0.2)
|
||||
i18n (~> 0.6)
|
||||
rails (>= 4.0)
|
||||
railties (4.1.2)
|
||||
actionpack (= 4.1.2)
|
||||
activesupport (= 4.1.2)
|
||||
railties (4.1.4)
|
||||
actionpack (= 4.1.4)
|
||||
activesupport (= 4.1.4)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.3.2)
|
||||
@ -244,9 +244,9 @@ GEM
|
||||
json (~> 1.8)
|
||||
rdoc (~> 4.0, < 5.0)
|
||||
sexp_processor (4.4.3)
|
||||
simple_calendar (1.1.3)
|
||||
simple_calendar (1.1.4)
|
||||
rails (>= 3.0)
|
||||
slim (2.0.2)
|
||||
slim (2.0.3)
|
||||
temple (~> 0.6.6)
|
||||
tilt (>= 1.3.3, < 2.1)
|
||||
slop (3.5.0)
|
||||
@ -260,7 +260,7 @@ GEM
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
temple (0.6.7)
|
||||
temple (0.6.8)
|
||||
terminal-table (1.4.5)
|
||||
therubyracer (0.12.1)
|
||||
libv8 (~> 3.16.14.0)
|
||||
|
Loading…
Reference in New Issue
Block a user