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

update rails admin [ci skip]

Browse source
This commit is contained in:
Maxwell Salzberg 2012-05-14 19:58:07 -07:00
parent 6282450418
commit 4d58940e51
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -37,7 +37,7 @@ gem 'newrelic_rpm'
gem "rpm_contrib", "~> 2.1.7" gem "rpm_contrib", "~> 2.1.7"
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.0.2' gem 'rails_admin', '~> 0.0.3'
gem 'rack-ssl', :require => 'rack/ssl' gem 'rack-ssl', :require => 'rack/ssl'
gem 'rack-rewrite', '~> 1.2.1', :require => false gem 'rack-rewrite', '~> 1.2.1', :require => false
gem 'rack-piwik', :require => 'rack/piwik' gem 'rack-piwik', :require => 'rack/piwik'

12
Gemfile.lock
View file

@ -89,7 +89,7 @@ GEM
fog fog
bbenezech-nested_form (0.0.6) bbenezech-nested_form (0.0.6)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
bootstrap-sass (2.0.2) bootstrap-sass (2.0.3)
builder (3.0.0) builder (3.0.0)
capistrano (2.9.0) capistrano (2.9.0)
highline highline
@ -120,7 +120,7 @@ GEM
coffee-script (2.2.0) coffee-script (2.2.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.3.1) coffee-script-source (1.3.2)
columnize (0.3.6) columnize (0.3.6)
cookiejar (0.3.0) cookiejar (0.3.0)
crack (0.3.1) crack (0.3.1)
@ -250,7 +250,7 @@ GEM
jquery-ui-rails (0.2.2) jquery-ui-rails (0.2.2)
jquery-rails jquery-rails
railties (>= 3.1.0) railties (>= 3.1.0)
json (1.7.1) json (1.7.3)
jwt (0.1.4) jwt (0.1.4)
json (>= 1.2.4) json (>= 1.2.4)
kaminari (0.13.0) kaminari (0.13.0)
@ -357,7 +357,7 @@ GEM
railties (= 3.1.4) railties (= 3.1.4)
rails-i18n (0.6.3) rails-i18n (0.6.3)
i18n (~> 0.5) i18n (~> 0.5)
rails_admin (0.0.2) rails_admin (0.0.3)
bbenezech-nested_form (~> 0.0.6) bbenezech-nested_form (~> 0.0.6)
bootstrap-sass (~> 2.0) bootstrap-sass (~> 2.0)
builder (~> 3.0) builder (~> 3.0)
@ -424,7 +424,7 @@ GEM
ruby-oembed (0.8.7) ruby-oembed (0.8.7)
ruby-progressbar (0.0.10) ruby-progressbar (0.0.10)
rubyzip (0.9.8) rubyzip (0.9.8)
sass (3.1.17) sass (3.1.18)
sass-rails (3.1.4) sass-rails (3.1.4)
actionpack (~> 3.1.0) actionpack (~> 3.1.0)
railties (~> 3.1.0) railties (~> 3.1.0)
@ -563,7 +563,7 @@ DEPENDENCIES
rack-ssl rack-ssl
rails (= 3.1.4) rails (= 3.1.4)
rails-i18n rails-i18n
rails_admin (~> 0.0.2) rails_admin (~> 0.0.3)
rails_autolink rails_autolink
redcarpet (= 2.0.1) redcarpet (= 2.0.1)
remotipart (~> 1.0) remotipart (~> 1.0)