nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump rails_admin

Browse source
This commit is contained in:
Jonne Haß 2012-10-20 03:49:30 +02:00
parent ec0483ccdb
commit c447eba4d1
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -31,7 +31,7 @@ gem 'markerb', :git => 'https://github.com/plataformatec/markerb.git'
gem 'messagebus_ruby_api', '1.0.3' gem 'messagebus_ruby_api', '1.0.3'
group :production do # we don't install these on travis to speed up test runs group :production do # we don't install these on travis to speed up test runs
gem 'rails_admin', '0.1.1' gem 'rails_admin', '0.2.0'
gem 'fastercsv', '1.5.5', :require => false gem 'fastercsv', '1.5.5', :require => false
gem 'rack-ssl', '1.3.2', :require => 'rack/ssl' gem 'rack-ssl', '1.3.2', :require => 'rack/ssl'
gem 'rack-rewrite', '1.3.1', :require => false gem 'rack-rewrite', '1.3.1', :require => false

22
Gemfile.lock
View file

@ -67,7 +67,7 @@ GEM
fog fog
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
bootstrap-sass (2.1.1.0) bootstrap-sass (2.1.1.0)
builder (3.0.3) builder (3.0.4)
capistrano (2.12.0) capistrano (2.12.0)
highline highline
net-scp (>= 1.0.0) net-scp (>= 1.0.0)
@ -151,6 +151,9 @@ GEM
net-ssh (>= 2.1.3) net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0) nokogiri (~> 1.5.0)
ruby-hmac ruby-hmac
font-awesome-sass-rails (2.0.0.0)
railties (>= 3.1.1)
sass-rails (>= 3.1.1)
foreigner (1.2.1) foreigner (1.2.1)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
foreman (0.60.2) foreman (0.60.2)
@ -208,7 +211,7 @@ GEM
jquery-rails (2.1.3) jquery-rails (2.1.3)
railties (>= 3.1.0, < 5.0) railties (>= 3.1.0, < 5.0)
thor (~> 0.14) thor (~> 0.14)
jquery-ui-rails (2.0.1) jquery-ui-rails (2.0.2)
jquery-rails jquery-rails
railties (>= 3.1.0) railties (>= 3.1.0)
jruby-pageant (1.1.1) jruby-pageant (1.1.1)
@ -303,16 +306,17 @@ GEM
activesupport (= 3.2.8) activesupport (= 3.2.8)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.2.8) railties (= 3.2.8)
rails_admin (0.1.1) rails_admin (0.2.0)
bootstrap-sass (~> 2.0) bootstrap-sass (~> 2.1)
builder (~> 3.0) builder (~> 3.0)
coffee-rails (~> 3.1) coffee-rails (~> 3.1)
font-awesome-sass-rails (~> 2.0)
haml (~> 3.1) haml (~> 3.1)
jquery-rails (~> 2.0) jquery-rails (~> 2.1)
jquery-ui-rails (~> 2.0) jquery-ui-rails (~> 2.0)
kaminari (~> 0.12) kaminari (~> 0.14)
nested_form (~> 0.2.3) nested_form (~> 0.2.3)
rack-pjax (~> 0.5) rack-pjax (~> 0.6)
rails (~> 3.1) rails (~> 3.1)
remotipart (~> 1.0) remotipart (~> 1.0)
sass-rails (~> 3.1) sass-rails (~> 3.1)
@ -361,7 +365,7 @@ GEM
ruby-oembed (0.8.7) ruby-oembed (0.8.7)
ruby-progressbar (1.0.2) ruby-progressbar (1.0.2)
rubyzip (0.9.9) rubyzip (0.9.9)
sass (3.2.2) sass (3.2.3)
sass-rails (3.2.5) sass-rails (3.2.5)
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)
@ -472,7 +476,7 @@ DEPENDENCIES
rack-ssl (= 1.3.2) rack-ssl (= 1.3.2)
rails (= 3.2.8) rails (= 3.2.8)
rails-i18n! rails-i18n!
rails_admin (= 0.1.1) rails_admin (= 0.2.0)
rails_autolink (= 1.0.9) rails_autolink (= 1.0.9)
rb-inotify (= 0.8.8) rb-inotify (= 0.8.8)
redcarpet (= 2.2.2) redcarpet (= 2.2.2)