Merge remote-tracking branch 'biodivportal/master' into feature/biodi…

…vportal/align-to-agroportal-3.0

Gemfile

@@ -23,6 +23,7 @@ gem 'request_store'
 gem 'parallel'
 gem 'json-ld'
 gem 'ffi', '~> 1.16.3'
+gem 'activesupport', '~> 3.2.22.5'
 
 # Monitoring
 gem 'cube-ruby', require: 'cube'

Gemfile.lock

@@ -74,7 +74,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.1.12)
+    activesupport (3.2.22.5)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
@@ -173,7 +174,7 @@ GEM
     http-cookie (1.0.7)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.6)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     json (2.8.1)
     json-canonicalization (0.4.0)
@@ -309,6 +310,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  activesupport (~> 3.2.22.5)
   bcrypt_pbkdf (>= 1.0, < 2.0)
   binding_of_caller (~> 1.0)
   capistrano (~> 3)