Skip to content
Extraits de code Groupes Projets
Valider db11b9d2 rédigé par Jonne Haß's avatar Jonne Haß
Parcourir les fichiers

Merge branch 'update_gems' into develop

parents 48049d9b 70eda773
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Gemfile
+ 11
− 11
Voir le fichier @ db11b9d2
...@@ -5,7 +5,7 @@ ruby '1.9.3' if ENV['HEROKU'] ...@@ -5,7 +5,7 @@ ruby '1.9.3' if ENV['HEROKU']
gem 'rails', '3.2.8' gem 'rails', '3.2.8'
gem 'foreman', '0.57' gem 'foreman', '0.59'
gem 'thin', '1.4.1', :require => false gem 'thin', '1.4.1', :require => false
gem 'rails_autolink', '1.0.9' gem 'rails_autolink', '1.0.9'
...@@ -56,7 +56,7 @@ end ...@@ -56,7 +56,7 @@ end
gem 'settingslogic', :git => 'https://github.com/binarylogic/settingslogic.git' gem 'settingslogic', :git => 'https://github.com/binarylogic/settingslogic.git'
# database # database
gem "activerecord-import", "0.2.9" gem "activerecord-import", "0.2.10"
gem 'foreigner', '1.2.1' gem 'foreigner', '1.2.1'
gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql' gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres' gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
...@@ -71,7 +71,7 @@ gem 'mini_magick', '3.4' ...@@ -71,7 +71,7 @@ gem 'mini_magick', '3.4'
# JSON and API # JSON and API
gem 'json', '1.7.5' gem 'json', '1.7.5'
gem 'acts_as_api', '0.4' gem 'acts_as_api', '0.4.1 '
# localization # localization
...@@ -80,7 +80,7 @@ gem 'rails-i18n' ...@@ -80,7 +80,7 @@ gem 'rails-i18n'
# parsing # parsing
gem 'nokogiri', '1.5.2' gem 'nokogiri', '1.5.5'
gem 'redcarpet', "2.1.1" gem 'redcarpet', "2.1.1"
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'
...@@ -112,7 +112,7 @@ gem 'gon', '4.0.0' ...@@ -112,7 +112,7 @@ gem 'gon', '4.0.0'
# assets # assets
group :assets do group :assets do
gem 'bootstrap-sass', '2.0.3.1' gem 'bootstrap-sass', '2.1.0.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
...@@ -133,8 +133,8 @@ gem 'jquery-rails', '2.0.2' ...@@ -133,8 +133,8 @@ gem 'jquery-rails', '2.0.2'
# web # web
gem 'faraday', '0.8.1' gem 'faraday', '0.8.4'
gem 'faraday_middleware', '0.8.7' gem 'faraday_middleware', '0.8.8'
gem 'jasmine', '1.2.1' gem 'jasmine', '1.2.1'
...@@ -148,14 +148,14 @@ group :test do ...@@ -148,14 +148,14 @@ group :test do
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.8'
gem 'timecop' gem 'timecop', '0.5.1'
gem 'factory_girl_rails', '4.0.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.0.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.25.0'
gem 'webmock', '1.8.7', :require => false gem 'webmock', '1.8.10', :require => false
gem 'spork', '1.0.0rc3' gem 'spork', '1.0.0rc3'
gem 'guard-rspec', '0.7.3' gem 'guard-rspec', '0.7.3'
...@@ -175,7 +175,7 @@ group :development do ...@@ -175,7 +175,7 @@ group :development do
gem 'capistrano', '2.12.0', :require => false gem 'capistrano', '2.12.0', :require => false
gem 'capistrano_colors', '0.5.5', :require => false gem 'capistrano_colors', '0.5.5', :require => false
gem 'capistrano-ext', '1.2.1', :require => false gem 'capistrano-ext', '1.2.1', :require => false
gem 'yard', '0.8.1', :require => false gem 'yard', '0.8.2.1', :require => false
# for tracing AR object instantiation and memory usage per request # for tracing AR object instantiation and memory usage per request
gem 'oink', '0.9.3' gem 'oink', '0.9.3'
......
Gemfile.lock
+ 24
− 24
Voir le fichier @ db11b9d2
...@@ -62,7 +62,7 @@ GEM ...@@ -62,7 +62,7 @@ GEM
activesupport (= 3.2.8) activesupport (= 3.2.8)
arel (~> 3.0.2) arel (~> 3.0.2)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activerecord-import (0.2.9) activerecord-import (0.2.10)
activerecord (~> 3.0) activerecord (~> 3.0)
activerecord (~> 3.0) activerecord (~> 3.0)
activeresource (3.2.8) activeresource (3.2.8)
...@@ -73,7 +73,7 @@ GEM ...@@ -73,7 +73,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
acts-as-taggable-on (2.3.3) acts-as-taggable-on (2.3.3)
rails (~> 3.0) rails (~> 3.0)
acts_as_api (0.4) acts_as_api (0.4.1)
activemodel (>= 3.0.0) activemodel (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
rack (>= 1.1.0) rack (>= 1.1.0)
...@@ -87,7 +87,7 @@ GEM ...@@ -87,7 +87,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.3.1) bootstrap-sass (2.1.0.0)
builder (3.0.3) builder (3.0.3)
capistrano (2.12.0) capistrano (2.12.0)
highline highline
...@@ -149,14 +149,14 @@ GEM ...@@ -149,14 +149,14 @@ GEM
excon (0.14.3) excon (0.14.3)
execjs (1.4.0) execjs (1.4.0)
multi_json (~> 1.0) multi_json (~> 1.0)
factory_girl (4.0.0) factory_girl (4.1.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
factory_girl_rails (4.0.0) factory_girl_rails (4.1.0)
factory_girl (~> 4.0.0) factory_girl (~> 4.1.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faraday (0.8.1) faraday (0.8.4)
multipart-post (~> 1.1) multipart-post (~> 1.1)
faraday_middleware (0.8.7) faraday_middleware (0.8.8)
faraday (>= 0.7.4, < 0.9) faraday (>= 0.7.4, < 0.9)
fastercsv (1.5.5) fastercsv (1.5.5)
ffi (1.1.5) ffi (1.1.5)
...@@ -175,7 +175,7 @@ GEM ...@@ -175,7 +175,7 @@ GEM
ruby-hmac ruby-hmac
foreigner (1.2.1) foreigner (1.2.1)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
foreman (0.57.0) foreman (0.59.0)
thor (>= 0.13.6) thor (>= 0.13.6)
formatador (0.2.3) formatador (0.2.3)
fuubar (1.0.0) fuubar (1.0.0)
...@@ -279,7 +279,7 @@ GEM ...@@ -279,7 +279,7 @@ GEM
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
netrc (0.7.7) netrc (0.7.7)
newrelic_rpm (3.3.5) newrelic_rpm (3.3.5)
nokogiri (1.5.2) nokogiri (1.5.5)
oauth (0.4.6) oauth (0.4.6)
oauth2 (0.6.1) oauth2 (0.6.1)
faraday (~> 0.7) faraday (~> 0.7)
...@@ -416,7 +416,7 @@ GEM ...@@ -416,7 +416,7 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
thor (0.16.0) thor (0.16.0)
tilt (1.3.3) tilt (1.3.3)
timecop (0.4.6) timecop (0.5.1)
treetop (1.4.10) treetop (1.4.10)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
...@@ -439,25 +439,25 @@ GEM ...@@ -439,25 +439,25 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
warden (1.2.1) warden (1.2.1)
rack (>= 1.0) rack (>= 1.0)
webmock (1.8.7) webmock (1.8.10)
addressable (>= 2.2.7) addressable (>= 2.2.7)
crack (>= 0.1.7) crack (>= 0.1.7)
will_paginate (3.0.3) will_paginate (3.0.3)
xpath (0.1.4) xpath (0.1.4)
nokogiri (~> 1.3) nokogiri (~> 1.3)
yard (0.8.1) yard (0.8.2.1)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
activerecord-import (= 0.2.9) activerecord-import (= 0.2.10)
acts-as-taggable-on (= 2.3.3) acts-as-taggable-on (= 2.3.3)
acts_as_api (= 0.4) acts_as_api (= 0.4.1)
addressable (= 2.3.2) addressable (= 2.3.2)
airbrake (= 3.1.0) airbrake (= 3.1.0)
asset_sync (= 0.4.2) asset_sync (= 0.4.2)
bootstrap-sass (= 2.0.3.1) bootstrap-sass (= 2.1.0.0)
bundler (> 1.1.0) bundler (> 1.1.0)
capistrano (= 2.12.0) capistrano (= 2.12.0)
capistrano-ext (= 1.2.1) capistrano-ext (= 1.2.1)
...@@ -469,14 +469,14 @@ DEPENDENCIES ...@@ -469,14 +469,14 @@ DEPENDENCIES
database_cleaner (= 0.8) database_cleaner (= 0.8)
debugger (= 1.2.0) debugger (= 1.2.0)
devise (= 2.1.2) devise (= 2.1.2)
factory_girl_rails (= 4.0.0) factory_girl_rails (= 4.1.0)
faraday (= 0.8.1) faraday (= 0.8.4)
faraday_middleware (= 0.8.7) faraday_middleware (= 0.8.8)
fastercsv (= 1.5.5) fastercsv (= 1.5.5)
fixture_builder (= 0.3.4) fixture_builder (= 0.3.4)
fog (= 1.4.0) fog (= 1.4.0)
foreigner (= 1.2.1) foreigner (= 1.2.1)
foreman (= 0.57) foreman (= 0.59)
fuubar (= 1.0.0) fuubar (= 1.0.0)
gon (= 4.0.0) gon (= 4.0.0)
guard-cucumber (= 1.0.0) guard-cucumber (= 1.0.0)
...@@ -497,7 +497,7 @@ DEPENDENCIES ...@@ -497,7 +497,7 @@ DEPENDENCIES
mobile-fu (= 1.1.0) mobile-fu (= 1.1.0)
mysql2 (= 0.3.11) mysql2 (= 0.3.11)
newrelic_rpm (= 3.3.5) newrelic_rpm (= 3.3.5)
nokogiri (= 1.5.2) nokogiri (= 1.5.5)
oink (= 0.9.3) oink (= 0.9.3)
omniauth (= 1.1.1) omniauth (= 1.1.1)
omniauth-facebook (= 1.3.0) omniauth-facebook (= 1.3.0)
...@@ -527,11 +527,11 @@ DEPENDENCIES ...@@ -527,11 +527,11 @@ DEPENDENCIES
settingslogic! settingslogic!
spork (= 1.0.0rc3) spork (= 1.0.0rc3)
thin (= 1.4.1) thin (= 1.4.1)
timecop timecop (= 0.5.1)
twitter (= 2.0.2) twitter (= 2.0.2)
typhoeus (= 0.3.3) typhoeus (= 0.3.3)
uglifier (= 1.3.0) uglifier (= 1.3.0)
unicorn (= 4.3.1) unicorn (= 4.3.1)
webmock (= 1.8.7) webmock (= 1.8.10)
will_paginate (= 3.0.3) will_paginate (= 3.0.3)
yard (= 0.8.1) yard (= 0.8.2.1)
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter