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

update a bunch of gems that DONT break the build

Browse source
This commit is contained in:
Maxwell Salzberg 2012-06-03 23:34:10 -07:00
parent 4eb95a1b6b
commit 89406b568e
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Gemfile
View file

@ -5,7 +5,7 @@ ruby '1.9.3' if ENV['HEROKU']
gem 'rails', '3.2.5' gem 'rails', '3.2.5'
gem 'foreman', '0.41' gem 'foreman', '0.46'
gem 'thin', '~> 1.3.1', :require => false gem 'thin', '~> 1.3.1', :require => false
gem 'rails_autolink' gem 'rails_autolink'
@ -37,7 +37,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.3' gem 'rails_admin', '~> 0.0.3'
gem 'fastercsv', '1.5.4', :require => false gem 'fastercsv', '1.5.5', :require => false
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
@ -81,7 +81,7 @@ gem 'rails-i18n'
# parsing # parsing
gem 'nokogiri', '1.5.2' gem 'nokogiri', '1.5.2'
gem 'redcarpet', "2.0.1" gem 'redcarpet', "2.1.1"
gem 'roxml', :git => 'git://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0' gem 'roxml', :git => 'git://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0'
gem 'ruby-oembed', '~> 0.8.7' gem 'ruby-oembed', '~> 0.8.7'
@ -156,7 +156,7 @@ group :test do
gem 'rspec-core', '~> 2.9.0' gem 'rspec-core', '~> 2.9.0'
gem 'rspec-instafail', '>= 0.1.7', :require => false gem 'rspec-instafail', '>= 0.1.7', :require => false
gem "rspec-rails", "~> 2.9.0" gem "rspec-rails", "~> 2.9.0"
gem 'selenium-webdriver', '2.22.0.rc1' gem 'selenium-webdriver', '2.22.1'
gem 'webmock', '~> 1.7', :require => false gem 'webmock', '~> 1.7', :require => false

16
Gemfile.lock
View file

@ -157,7 +157,7 @@ GEM
rack (~> 1.1) rack (~> 1.1)
faraday_middleware (0.8.7) faraday_middleware (0.8.7)
faraday (>= 0.7.4, < 0.9) faraday (>= 0.7.4, < 0.9)
fastercsv (1.5.4) fastercsv (1.5.5)
ffi (1.0.11) ffi (1.0.11)
fixture_builder (0.3.3) fixture_builder (0.3.3)
activerecord (>= 2) activerecord (>= 2)
@ -174,7 +174,7 @@ GEM
ruby-hmac ruby-hmac
foreigner (1.1.6) foreigner (1.1.6)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
foreman (0.41.0) foreman (0.46.0)
thor (>= 0.13.6) thor (>= 0.13.6)
formatador (0.2.1) formatador (0.2.1)
fuubar (1.0.0) fuubar (1.0.0)
@ -351,7 +351,7 @@ GEM
rbx-require-relative (0.0.9) rbx-require-relative (0.0.9)
rdoc (3.12) rdoc (3.12)
json (~> 1.4) json (~> 1.4)
redcarpet (2.0.1) redcarpet (2.1.1)
redis (2.2.2) redis (2.2.2)
redis-namespace (1.0.3) redis-namespace (1.0.3)
redis (< 3.0.0) redis (< 3.0.0)
@ -396,7 +396,7 @@ GEM
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)
tilt (~> 1.3) tilt (~> 1.3)
selenium-webdriver (2.22.0.rc1) selenium-webdriver (2.22.1)
childprocess (>= 0.2.5) childprocess (>= 0.2.5)
ffi (~> 1.0) ffi (~> 1.0)
libwebsocket (~> 0.1.3) libwebsocket (~> 0.1.3)
@ -476,11 +476,11 @@ DEPENDENCIES
factory_girl_rails (= 1.7.0) factory_girl_rails (= 1.7.0)
faraday faraday
faraday_middleware faraday_middleware
fastercsv (= 1.5.4) fastercsv (= 1.5.5)
fixture_builder (= 0.3.3) fixture_builder (= 0.3.3)
fog fog
foreigner (~> 1.1.0) foreigner (~> 1.1.0)
foreman (= 0.41) foreman (= 0.46)
fuubar (>= 1.0) fuubar (>= 1.0)
gon gon
guard-cucumber guard-cucumber
@ -518,7 +518,7 @@ DEPENDENCIES
rails-i18n rails-i18n
rails_admin (~> 0.0.3) rails_admin (~> 0.0.3)
rails_autolink rails_autolink
redcarpet (= 2.0.1) redcarpet (= 2.1.1)
remotipart (~> 1.0) remotipart (~> 1.0)
resque (= 1.20.0) resque (= 1.20.0)
resque-timeout (= 1.0.0) resque-timeout (= 1.0.0)
@ -531,7 +531,7 @@ DEPENDENCIES
ruby-debug ruby-debug
ruby-oembed (~> 0.8.7) ruby-oembed (~> 0.8.7)
sass-rails (= 3.2.5) sass-rails (= 3.2.5)
selenium-webdriver (= 2.22.0.rc1) selenium-webdriver (= 2.22.1)
settingslogic! settingslogic!
spork (~> 1.0rc2) spork (~> 1.0rc2)
thin (~> 1.3.1) thin (~> 1.3.1)