Commit e7be5d2f authored by Jonne Haß's avatar Jonne Haß

Merge pull request #3612 from diaspora/update_gems

Update gems
parents 8b89a5ca 0b206534
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'bundler', '> 1.1.0'
gem 'rails', '3.2.8' gem 'rails', '3.2.8'
gem 'foreman', '0.59' gem 'foreman', '0.60.2'
gem 'unicorn', '4.3.1', :require => false gem 'unicorn', '4.4.0', :require => false
gem 'rails_autolink', '1.0.9' gem 'rails_autolink', '1.0.9'
...@@ -25,7 +23,7 @@ gem 'omniauth-facebook', '1.4.1' ...@@ -25,7 +23,7 @@ gem 'omniauth-facebook', '1.4.1'
gem 'omniauth-tumblr', '1.1' gem 'omniauth-tumblr', '1.1'
gem 'omniauth-twitter', '0.0.13' gem 'omniauth-twitter', '0.0.13'
gem 'twitter', '4.1.1' gem 'twitter', '4.2.0'
# mail # mail
...@@ -33,10 +31,10 @@ gem 'markerb', :git => 'https://github.com/plataformatec/markerb.git' ...@@ -33,10 +31,10 @@ 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.2.1', :require => false gem 'rack-rewrite', '1.3.1', :require => false
# analytics # analytics
gem 'rack-google-analytics', '0.11.0', :require => 'rack/google-analytics' gem 'rack-google-analytics', '0.11.0', :require => 'rack/google-analytics'
...@@ -55,7 +53,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite' ...@@ -55,7 +53,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
# file uploading # file uploading
gem 'carrierwave', '0.6.2' gem 'carrierwave', '0.7.1'
gem 'fog', '1.6.0' gem 'fog', '1.6.0'
gem 'mini_magick', '3.4' gem 'mini_magick', '3.4'
...@@ -67,18 +65,18 @@ gem 'acts_as_api', '0.4.1 ' ...@@ -67,18 +65,18 @@ gem 'acts_as_api', '0.4.1 '
# localization # localization
gem 'i18n-inflector-rails', '~> 1.0' gem 'i18n-inflector-rails', '~> 1.0'
gem 'rails-i18n', :git => "https://github.com/svenfuchs/rails-i18n.git" gem 'rails-i18n', '0.7.0'
# parsing # parsing
gem 'nokogiri', '1.5.5' gem 'nokogiri', '1.5.5'
gem 'redcarpet', "2.1.1" gem 'redcarpet', "2.2.2"
gem 'roxml', :git => 'https://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0' gem 'roxml', :git => 'https://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0'
gem 'ruby-oembed', '0.8.7' gem 'ruby-oembed', '0.8.7'
# queue # queue
gem 'resque', '1.22.0' gem 'resque', '1.23.0'
gem 'resque-timeout', '1.0.0' gem 'resque-timeout', '1.0.0'
# tags # tags
...@@ -97,13 +95,13 @@ gem 'haml', '3.1.7' ...@@ -97,13 +95,13 @@ gem 'haml', '3.1.7'
gem 'mobile-fu', '1.1.0' gem 'mobile-fu', '1.1.0'
gem 'will_paginate', '3.0.3' gem 'will_paginate', '3.0.3'
gem 'client_side_validations', '3.1.4' gem 'client_side_validations', '3.2.1'
gem 'gon', '4.0.0' gem 'gon', '4.0.1'
# assets # assets
group :assets do group :assets do
gem 'bootstrap-sass', '2.1.0.0' gem 'bootstrap-sass', '2.1.1.0'
gem 'sass-rails', '3.2.5' gem 'sass-rails', '3.2.5'
# Windows and OSX have an execjs compatible runtime built-in, Linux users should # Windows and OSX have an execjs compatible runtime built-in, Linux users should
...@@ -113,7 +111,7 @@ group :assets do ...@@ -113,7 +111,7 @@ group :assets do
# gem 'therubyracer', :platform => :ruby # gem 'therubyracer', :platform => :ruby
gem 'handlebars_assets', '0.6.5' gem 'handlebars_assets', '0.6.6'
gem 'uglifier', '1.3.0' gem 'uglifier', '1.3.0'
gem "asset_sync", '0.5.0', :require => false gem "asset_sync", '0.5.0', :require => false
...@@ -124,7 +122,7 @@ gem 'jquery-rails', '2.1.3' ...@@ -124,7 +122,7 @@ gem 'jquery-rails', '2.1.3'
# web # web
gem 'faraday', '0.8.4' gem 'faraday', '0.8.4'
gem 'faraday_middleware', '0.8.8' gem 'faraday_middleware', '0.9.0'
gem 'jasmine', '1.2.1' gem 'jasmine', '1.2.1'
...@@ -134,29 +132,30 @@ gem 'jasmine', '1.2.1' ...@@ -134,29 +132,30 @@ gem 'jasmine', '1.2.1'
group :test do group :test do
gem 'capybara', '1.1.2' gem 'capybara', '1.1.3'
gem 'cucumber-rails', '1.3.0', :require => false gem 'cucumber-rails', '1.3.0', :require => false
gem 'database_cleaner', '0.8' gem 'database_cleaner', '0.9.1'
gem 'timecop', '0.5.1' gem 'timecop', '0.5.3'
gem 'factory_girl_rails', '4.1.0' gem 'factory_girl_rails', '4.1.0'
gem 'fixture_builder', '0.3.4' gem 'fixture_builder', '0.3.4'
gem 'fuubar', '1.0.0' gem 'fuubar', '1.1.0'
gem 'rspec-instafail', '0.2.4', :require => false gem 'rspec-instafail', '0.2.4', :require => false
gem 'selenium-webdriver', '2.25.0' gem 'selenium-webdriver', '2.26.0'
gem 'webmock', '1.8.10', :require => false gem 'webmock', '1.8.11', :require => false
gem 'spork', '1.0.0rc3' gem 'spork', '1.0.0rc3'
gem 'guard-rspec', '0.7.3' gem 'guard-rspec', '2.1.1'
gem 'guard-spork', '0.8.0' gem 'guard-spork', '1.2.3'
gem 'guard-cucumber', '1.0.0' gem 'guard-cucumber', '1.2.2'
gem 'rb-inotify', '0.8.8'
end end
group :test, :development do group :test, :development do
gem 'debugger', '1.2.0' gem 'debugger', '1.2.1'
gem "rspec-rails", "2.11.0" gem "rspec-rails", "2.11.4"
end end
group :development do group :development do
......
This diff is collapsed.
# A sample Guardfile # A sample Guardfile
# More info at https://github.com/guard/guard#readme # More info at https://github.com/guard/guard#readme
# also, http://asciicasts.com/episodes/264-guard # also, http://asciicasts.com/episodes/264-guard
guard 'rspec', :version => 2, :all_on_start => false do guard 'rspec', :all_on_start => false do
watch(%r{^spec/.+_spec\.rb$}) watch(%r{^spec/.+_spec\.rb$})
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" } watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
watch('spec/spec_helper.rb') { "spec" } watch('spec/spec_helper.rb') { "spec" }
......
...@@ -166,7 +166,7 @@ describe Photo do ...@@ -166,7 +166,7 @@ describe Photo do
file = File.open(@fail_fixture_name) file = File.open(@fail_fixture_name)
lambda { lambda {
@photo.unprocessed_image.store! file @photo.unprocessed_image.store! file
}.should raise_error CarrierWave::IntegrityError, 'You are not allowed to upload "xml" files, allowed types: ["jpg", "jpeg", "png", "gif"]' }.should raise_error CarrierWave::IntegrityError, 'You are not allowed to upload "xml" files, allowed types: jpg, jpeg, png, gif'
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment