Bundle update

This commit is contained in:
echarp 2014-10-31 14:32:57 +01:00
parent 6358cde138
commit e0554d8ad2
1 changed files with 43 additions and 41 deletions

View File

@ -1,6 +1,6 @@
GIT
remote: git://github.com/activeadmin/activeadmin.git
revision: 0becbef0918a38b91ad120aba7c2f6641e9b5440
revision: dbbcde7800e93a0924101a24d3ae6fa10180032a
specs:
activeadmin (1.0.0.pre)
arbre (~> 1.0, >= 1.0.2)
@ -8,7 +8,7 @@ GIT
coffee-rails
formtastic (~> 3.0)
formtastic_i18n
inherited_resources (~> 1.4.1)
inherited_resources (~> 1.4, != 1.5.0)
jquery-rails
jquery-ui-rails (~> 5.0)
kaminari (~> 0.15)
@ -34,31 +34,31 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.6)
actionpack (= 4.1.6)
actionview (= 4.1.6)
actionmailer (4.1.7)
actionpack (= 4.1.7)
actionview (= 4.1.7)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.6)
actionview (= 4.1.6)
activesupport (= 4.1.6)
actionpack (4.1.7)
actionview (= 4.1.7)
activesupport (= 4.1.7)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.6)
activesupport (= 4.1.6)
actionview (4.1.7)
activesupport (= 4.1.7)
builder (~> 3.1)
erubis (~> 2.7.0)
actionview-encoded_mail_to (1.0.5)
rails
activeadmin_pagedown (0.0.2)
activeadmin (>= 0.5.0)
activemodel (4.1.6)
activesupport (= 4.1.6)
activemodel (4.1.7)
activesupport (= 4.1.7)
builder (~> 3.1)
activerecord (4.1.6)
activemodel (= 4.1.6)
activesupport (= 4.1.6)
activerecord (4.1.7)
activemodel (= 4.1.7)
activesupport (= 4.1.7)
arel (~> 5.0.0)
activesupport (4.1.6)
activesupport (4.1.7)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@ -120,7 +120,7 @@ GEM
compass-rails (2.0.1)
compass (~> 1.0.0)
debug_inspector (0.0.2)
devise (3.4.0)
devise (3.4.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
@ -190,9 +190,11 @@ GEM
http_accept_language (2.0.2)
http_parser.rb (0.6.0)
i18n (0.6.11)
inherited_resources (1.4.1)
inherited_resources (1.5.1)
actionpack (>= 3.2, < 4.2)
has_scope (~> 0.6.0.rc)
responders (~> 1.0.0.rc)
railties (>= 3.2, < 4.2)
responders (~> 1.0)
jbuilder (2.2.4)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
@ -247,27 +249,27 @@ GEM
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.6)
actionmailer (= 4.1.6)
actionpack (= 4.1.6)
actionview (= 4.1.6)
activemodel (= 4.1.6)
activerecord (= 4.1.6)
activesupport (= 4.1.6)
rails (4.1.7)
actionmailer (= 4.1.7)
actionpack (= 4.1.7)
actionview (= 4.1.7)
activemodel (= 4.1.7)
activerecord (= 4.1.7)
activesupport (= 4.1.7)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.6)
railties (= 4.1.7)
sprockets-rails (~> 2.0)
rails-i18n (4.0.3)
i18n (~> 0.6)
railties (~> 4.0)
railties (4.1.6)
actionpack (= 4.1.6)
activesupport (= 4.1.6)
railties (4.1.7)
actionpack (= 4.1.7)
activesupport (= 4.1.7)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
rake (10.3.2)
ransack (1.5.0)
ransack (1.5.1)
actionpack (>= 3.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
@ -280,15 +282,15 @@ GEM
json (~> 1.4)
redcarpet (3.2.0)
ref (1.0.5)
responders (1.0.0)
railties (>= 3.2, < 5)
rubocop (0.26.1)
responders (1.1.1)
railties (>= 3.2, < 4.2)
rubocop (0.27.0)
astrolabe (~> 1.3)
parser (>= 2.2.0.pre.4, < 3.0)
parser (>= 2.2.0.pre.6, < 3.0)
powerpack (~> 0.0.6)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
ruby-progressbar (1.6.0)
ruby-progressbar (1.6.1)
ruby2ruby (2.1.3)
ruby_parser (~> 3.1)
sexp_processor (~> 4.0)
@ -308,7 +310,7 @@ GEM
sexp_processor (4.4.4)
simple_calendar (1.1.6)
rails (>= 3.0)
simple_oauth (0.2.0)
simple_oauth (0.3.0)
simplecov (0.9.1)
docile (~> 1.1.0)
multi_json (~> 1.0)
@ -319,7 +321,7 @@ GEM
tilt (>= 1.3.3, < 2.1)
slop (3.6.0)
spring (1.1.3)
sprockets (2.12.2)
sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
@ -328,7 +330,7 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.9)
sqlite3 (1.3.10)
temple (0.6.10)
terminal-table (1.4.5)
therubyracer (0.12.1)
@ -345,7 +347,7 @@ GEM
tinymce-rails (~> 4.0)
turbolinks (2.5.1)
coffee-rails
twitter (5.11.0)
twitter (5.12.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
equalizer (~> 0.0.9)
@ -355,7 +357,7 @@ GEM
json (~> 1.8)
memoizable (~> 0.4.0)
naught (~> 1.0)
simple_oauth (~> 0.2.0)
simple_oauth (~> 0.3.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.3)