Renamed `apply_inline_css` to `style_message` as suggested

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 3789c9fb8df1a6ac500e6ed5787a7c5782a3edce..ef93f0d8ff0960b072d87945805c46c87daecee1 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "4.2.5"
+gem "rails", "4.2.7.1"
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
@@ -38,7 +38,7 @@ gem "r2"
 gem "autoprefixer-rails"
 
 # Use image_optim to optimise images
-gem "image_optim", ">= 0.22.0"
+gem "image_optim_rails"
 
 # Load rails plugins
 gem "rails-i18n", "~> 4.0.0"
@@ -63,6 +63,8 @@ gem "omniauth-openid"
 gem "omniauth-google-oauth2", ">= 0.2.7"
 gem "omniauth-facebook"
 gem "omniauth-windowslive"
+gem "omniauth-github"
+gem "omniauth-mediawiki", ">= 0.0.3"
 
 # Markdown formatting support
 gem "redcarpet"
@@ -80,9 +82,8 @@ gem "SystemTimer", ">= 1.1.3", :require => "system_timer", :platforms => :ruby_1
 # Load faraday for mockable HTTP client
 gem "faraday"
 
-# Load httpclient and soap4r for SOAP support for Quova GeoIP queries
-gem "httpclient"
-gem "soap4r-ruby1.9"
+# Load geoip for querying Maxmind GeoIP database
+gem "geoip"
 
 # Load memcache client in case we are using it
 gem "dalli"
@@ -101,6 +102,7 @@ group :test do
   gem "rubocop"
   gem "timecop"
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
+  gem "webmock"
 end
 
 # Needed in development as well so rake can see konacha tasks
@@ -108,5 +110,6 @@ group :development, :test do
   gem "jshint"
   gem "konacha"
   gem "poltergeist"
+  gem "factory_girl_rails"
   gem "coveralls", :require => false
 end