Replace timecop with the rails builtin travel_to method

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index e3c8f5cfff82949ed1f0e73b5659785bdae257e6..baa1dcc04985ae87cdc921306368f44633692574 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "4.2.4"
+gem "rails", "5.0.4"

 
 # 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


@@ -22,7 +22,7 @@ gem "sass-rails", "~> 5.0"
 gem "uglifier", ">= 1.3.0"
 
 # Use CoffeeScript for .js.coffee assets and views
 gem "uglifier", ">= 1.3.0"
 
 # Use CoffeeScript for .js.coffee assets and views

-gem "coffee-rails", "~> 4.1.0"
+gem "coffee-rails", "~> 4.2"

 
 # Use jquery as the JavaScript library
 gem "jquery-rails"
 
 # Use jquery as the JavaScript library
 gem "jquery-rails"


@@ -38,27 +38,33 @@ gem "r2"
 gem "autoprefixer-rails"
 
 # Use image_optim to optimise images
 gem "autoprefixer-rails"
 
 # Use image_optim to optimise images

-gem "image_optim"
+gem "image_optim_rails"

 
 # Load rails plugins
 
 # Load rails plugins

-gem "rails-i18n", "~> 4.0.0"
+gem "actionpack-page_caching"
+gem "composite_primary_keys", "~> 9.0.7"
+gem "deadlock_retry", ">= 1.2.0"

 gem "dynamic_form"
 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 "composite_primary_keys", "~> 8.1.0"

 gem "http_accept_language", "~> 2.0.0"
 gem "http_accept_language", "~> 2.0.0"

+gem "i18n-js", ">= 3.0.0"
+gem "oauth-plugin", ">= 0.5.1"

 gem "paperclip", "~> 4.0"
 gem "paperclip", "~> 4.0"

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

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

-gem "actionpack-page_caching"
+gem "rails-i18n", "~> 4.0.0"
+gem "record_tag_helper"
+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 "omniauth-google-oauth2", ">= 0.2.7"

 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 +74,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,33 +83,44 @@ 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"
+
+# Load canonical-rails to generate canonical URLs
+gem "canonical-rails"
+

 # Used to generate logstash friendly log files
 gem "logstasher"
 
 # Gems useful for development
 group :development do
 # Used to generate logstash friendly log files
 gem "logstasher"
 
 # Gems useful for development
 group :development do

+  gem "listen"

   gem "vendorer"
 end
 
 # Gems needed for running tests
 group :test do
   gem "vendorer"
 end
 
 # Gems needed for running tests
 group :test do

-  gem "rubocop"
-  gem "timecop"

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

+  gem "rails-controller-testing"
+  gem "rubocop"
+  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 "jshint"

-  gem "konacha"
+  #  gem "konacha"

   gem "poltergeist"
   gem "poltergeist"

-  gem "coveralls", :require => false

 end
 end