Use user factory for user_preference model tests.

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 3c8c3548b31e352fe4752bce950bb6d06a5c08a9..72fc32683f2e02ee50f7a73b404735a40f8c4ab1 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,10 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "4.2.4"
-
-# Sprockets 3 seems to be buggy, so stick with 2 for now
-gem "sprockets", "~> 2.12.3"
+gem "rails", "4.2.8"

 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19


@@ -40,25 +37,33 @@ gem "r2"
 # Use autoprefixer to generate CSS prefixes
 gem "autoprefixer-rails"
 
 # Use autoprefixer to generate CSS prefixes
 gem "autoprefixer-rails"
 

+# Use image_optim to optimise images
+gem "image_optim_rails"
+

 # Load rails plugins
 # Load rails plugins

-gem "rails-i18n", "~> 4.0.0"
-gem "dynamic_form"
-gem "rinku", ">= 1.2.2", :require => "rails_rinku"
-gem "oauth-plugin", ">= 0.5.1"
-gem "validates_email_format_of", ">= 1.5.1"
+gem "actionpack-page_caching"

 gem "composite_primary_keys", "~> 8.1.0"
 gem "composite_primary_keys", "~> 8.1.0"

-gem "http_accept_language", "~> 2.0.0"
-gem "paperclip", "~> 4.0"

 gem "deadlock_retry", ">= 1.2.0"
 gem "deadlock_retry", ">= 1.2.0"

+gem "dynamic_form"
+gem "http_accept_language", "~> 2.0.0"

 gem "i18n-js", ">= 3.0.0.rc10"
 gem "i18n-js", ">= 3.0.0.rc10"

+gem "oauth-plugin", ">= 0.5.1"
+gem "paperclip", "~> 4.0"

 gem "rack-cors"
 gem "rack-cors"

-gem "actionpack-page_caching"
+gem "rails-i18n", "~> 4.0.0"
+gem "rinku", ">= 1.2.2", :require => "rails_rinku"
+gem "validates_email_format_of", ">= 1.5.1"
+
+# Sanitise URIs
+gem "rack-uri_sanitizer"

 
 # Omniauth for authentication
 gem "omniauth"
 
 # Omniauth for authentication
 gem "omniauth"

-gem "omniauth-openid"
-gem "openstreetmap-omniauth-google-oauth2", ">= 0.2.6.1", :require => "omniauth-google-oauth2"

 gem "omniauth-facebook"
 gem "omniauth-facebook"

+gem "omniauth-github"
+gem "omniauth-google-oauth2", ">= 0.2.7"
+gem "omniauth-mediawiki", ">= 0.0.3"
+gem "omniauth-openid"

 gem "omniauth-windowslive"
 
 # Markdown formatting support
 gem "omniauth-windowslive"
 
 # Markdown formatting support


@@ -68,8 +73,8 @@ gem "redcarpet"
 gem "libxml-ruby", ">= 2.0.5", :require => "libxml"
 
 # Use for HTML sanitisation
 gem "libxml-ruby", ">= 2.0.5", :require => "libxml"
 
 # Use for HTML sanitisation

-gem "sanitize"

 gem "htmlentities"
 gem "htmlentities"

+gem "sanitize"

 
 # Load SystemTimer for implementing request timeouts
 gem "SystemTimer", ">= 1.1.3", :require => "system_timer", :platforms => :ruby_18
 
 # Load SystemTimer for implementing request timeouts
 gem "SystemTimer", ">= 1.1.3", :require => "system_timer", :platforms => :ruby_18


@@ -77,14 +82,19 @@ gem "SystemTimer", ">= 1.1.3", :require => "system_timer", :platforms => :ruby_1
 # Load faraday for mockable HTTP client
 gem "faraday"
 
 # 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 rotp to generate TOTP tokens
+gem "rotp"

 
 # Load memcache client in case we are using it
 gem "dalli"
 gem "kgio"
 
 
 # Load memcache client in case we are using it
 gem "dalli"
 gem "kgio"
 

+# Load secure_headers for Content-Security-Policy support
+gem "secure_headers"
+

 # Used to generate logstash friendly log files
 gem "logstasher"
 
 # Used to generate logstash friendly log files
 gem "logstasher"
 


@@ -95,15 +105,17 @@ end
 
 # Gems needed for running tests
 group :test do
 
 # Gems needed for running tests
 group :test do

+  gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]

   gem "rubocop"
   gem "timecop"
   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
 group :development, :test do
 end
 
 # Needed in development as well so rake can see konacha tasks
 group :development, :test do

+  gem "coveralls", :require => false
+  gem "factory_girl_rails"

   gem "jshint"
   gem "konacha"
   gem "poltergeist"
   gem "jshint"
   gem "konacha"
   gem "poltergeist"

-  gem "coveralls", :require => false

 end
 end