Use user factories for user_block integration tests.

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index c2578d6f597a484be19baec0197f3e67bc39a440..72fc32683f2e02ee50f7a73b404735a40f8c4ab1 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.7.1"
+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


@@ -92,6 +92,9 @@ gem "rotp"
 gem "dalli"
 gem "kgio"
 
 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"
 


@@ -103,7 +106,6 @@ end
 # Gems needed for running tests
 group :test do
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
 # Gems needed for running tests
 group :test do
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]

-  gem "minitest-stub_any_instance"

   gem "rubocop"
   gem "timecop"
   gem "webmock"
   gem "rubocop"
   gem "timecop"
   gem "webmock"