diff --git a/Gemfile b/Gemfile
index 7a17dcdf35969ce8e27ddfcaf125023e91f53e71..3bb9639ceaa8a5e48bb8be7921a4ae0a94f80fa1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ require File.expand_path('../lib/gemfile_tools.rb', __FILE__)
## CORE
# rake 11.x throws lots of warnings about rails 3.2 code
gem "rake"
-gem "rails", "~> 4.2.7"
+gem "rails", "~> 4.2.11"
# TODO: drop this and the respond_with usage
gem 'responders', '~> 2.0'
gem "couchrest", "~> 2.0.0.rc3"
diff --git a/Gemfile.lock b/Gemfile.lock
index 3cae8eb518502be7f1b3d6ee83753966e6cf2cd9..07d050ffab0d743ff707230a467e166ae13838ec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -26,36 +26,36 @@ GEM
remote: https://rubygems.org/
specs:
SyslogLogger (2.0)
- actionmailer (4.2.10)
- actionpack (= 4.2.10)
- actionview (= 4.2.10)
- activejob (= 4.2.10)
+ actionmailer (4.2.11.1)
+ actionpack (= 4.2.11.1)
+ actionview (= 4.2.11.1)
+ activejob (= 4.2.11.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.10)
- actionview (= 4.2.10)
- activesupport (= 4.2.10)
+ actionpack (4.2.11.1)
+ actionview (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (4.2.10)
- activesupport (= 4.2.10)
+ actionview (4.2.11.1)
+ activesupport (= 4.2.11.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (4.2.10)
- activesupport (= 4.2.10)
+ activejob (4.2.11.1)
+ activesupport (= 4.2.11.1)
globalid (>= 0.3.0)
- activemodel (4.2.10)
- activesupport (= 4.2.10)
+ activemodel (4.2.11.1)
+ activesupport (= 4.2.11.1)
builder (~> 3.1)
- activerecord (4.2.10)
- activemodel (= 4.2.10)
- activesupport (= 4.2.10)
+ activerecord (4.2.11.1)
+ activemodel (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
arel (~> 6.0)
- activesupport (4.2.10)
+ activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
@@ -91,7 +91,7 @@ GEM
simple_form (~> 3.4)
cliver (0.3.2)
coderay (1.1.2)
- concurrent-ruby (1.0.5)
+ concurrent-ruby (1.1.5)
couchrest (2.0.0)
httpclient (~> 2.8)
mime-types (>= 1.15)
@@ -104,7 +104,7 @@ GEM
actionpack (~> 4.0)
couchrest (~> 2.0.0.rc3)
couchrest_model (~> 2.1.0.beta2)
- crass (1.0.3)
+ crass (1.0.4)
cucumber (2.4.0)
builder (>= 2.1.2)
cucumber-core (~> 1.5.0)
@@ -143,7 +143,7 @@ GEM
i18n (~> 0.9.1)
ffi (1.9.18)
gherkin (4.1.3)
- globalid (0.4.1)
+ globalid (0.4.2)
activesupport (>= 4.2.0)
haml (5.0.4)
temple (>= 0.8.0)
@@ -170,7 +170,7 @@ GEM
http_accept_language (2.1.1)
http_parser.rb (0.6.0)
httpclient (2.8.3)
- i18n (0.9.1)
+ i18n (0.9.5)
concurrent-ruby (~> 1.0)
i18n-missing_translations (0.0.1)
jquery-rails (4.3.1)
@@ -194,10 +194,10 @@ GEM
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.19)
- loofah (2.1.1)
+ loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
- mail (2.7.0)
+ mail (2.7.1)
mini_mime (>= 0.1.1)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
@@ -206,9 +206,9 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
- mini_mime (1.0.0)
- mini_portile2 (2.3.0)
- minitest (5.10.3)
+ mini_mime (1.0.1)
+ mini_portile2 (2.4.0)
+ minitest (5.11.3)
minitest-stub-const (0.6)
mocha (1.3.0)
metaclass (~> 0.0.1)
@@ -216,8 +216,8 @@ GEM
multi_test (0.1.2)
multipart-post (2.0.0)
naught (1.1.0)
- nokogiri (1.8.1)
- mini_portile2 (~> 2.3.0)
+ nokogiri (1.9.1)
+ mini_portile2 (~> 2.4.0)
phantomjs-binaries (2.1.1.1)
sys-uname (= 0.9.0)
poltergeist (1.16.0)
@@ -229,41 +229,41 @@ GEM
method_source (~> 0.9.0)
psych (2.2.4)
public_suffix (3.0.1)
- rack (1.6.8)
+ rack (1.6.11)
rack-protection (1.5.3)
rack
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.2.10)
- actionmailer (= 4.2.10)
- actionpack (= 4.2.10)
- actionview (= 4.2.10)
- activejob (= 4.2.10)
- activemodel (= 4.2.10)
- activerecord (= 4.2.10)
- activesupport (= 4.2.10)
+ rails (4.2.11.1)
+ actionmailer (= 4.2.11.1)
+ actionpack (= 4.2.11.1)
+ actionview (= 4.2.11.1)
+ activejob (= 4.2.11.1)
+ activemodel (= 4.2.11.1)
+ activerecord (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.10)
+ railties (= 4.2.11.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
- rails-dom-testing (1.0.8)
- activesupport (>= 4.2.0.beta, < 5.0)
+ rails-dom-testing (1.0.9)
+ activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
- rails-html-sanitizer (1.0.3)
- loofah (~> 2.0)
+ rails-html-sanitizer (1.0.4)
+ loofah (~> 2.2, >= 2.2.2)
rails-i18n (4.0.9)
i18n (~> 0.7)
railties (~> 4.0)
rails_warden (0.5.8)
warden (>= 1.0.0)
- railties (4.2.10)
- actionpack (= 4.2.10)
- activesupport (= 4.2.10)
+ railties (4.2.11.1)
+ actionpack (= 4.2.11.1)
+ activesupport (= 4.2.11.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (12.3.0)
+ rake (12.3.2)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
@@ -296,7 +296,7 @@ GEM
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
- sprockets (3.7.1)
+ sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
@@ -309,7 +309,7 @@ GEM
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
- thor (0.20.0)
+ thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.8)
twitter (6.2.0)
@@ -323,7 +323,7 @@ GEM
multipart-post (~> 2.0)
naught (~> 1.0)
simple_oauth (~> 0.3.0)
- tzinfo (1.2.4)
+ tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.0.1)
execjs (>= 0.3.0, < 3)
@@ -376,7 +376,7 @@ DEPENDENCIES
poltergeist
pry
psych (~> 2.2.4)
- rails (~> 4.2.7)
+ rails (~> 4.2.11)
rails-i18n
rails_warden
rake
@@ -391,4 +391,4 @@ DEPENDENCIES
valid_email
BUNDLED WITH
- 1.16.0
+ 1.17.3