Merge branch 'staging'

.ruby-version

@@ -1 +1 @@
-2.1
+2.1.7

.ruby-version-deployment

@@ -1 +1 @@
-2.1.6
+2.1.7

Gemfile

@@ -1,34 +1,38 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 3.2.21'
+gem 'rails', '~> 3.2.22'
 gem 'rack-protection', '~> 1.5.3'
-gem 'secure_headers', '~> 2.2.2'
+gem 'secure_headers', '~> 2.2.3'
+
+gem 'rack-mini-profiler', require: false
 
 gem 'pry-rails', '~> 0.3.2'
 
 gem 'pg', '~> 0.18.1'
 gem 'foreigner', '~> 1.7.2'
 
-gem 'rdf', '~> 1.1.9'
+gem 'rdf', '~> 1.1.15'
 gem 'rdf-rdfxml', '~> 1.1.3'
 gem 'rdf-n3', '~> 1.1.2'
 
+gem 'redis-semaphore', '~> 0.2.4'
+
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
   gem 'jstree-rails', github: 'tristanm/jstree-rails'
   # sass-rails >= 4.0 is not compativle with rails 3
-  gem 'sass-rails',     '~> 3.2.3'
+  gem 'sass-rails',     '~> 3.2.6'
   gem 'bootstrap-sass', '~> 3.3.3'
-  # coffee-rails > 3.2.1 is not compatible with rails 3
-  gem 'coffee-rails',   '~> 3.2.1'
+  # coffee-rails > 3.2 is not compatible with rails 3
+  gem 'coffee-rails',   '~> 3.2.2'
   gem 'compass',        '~> 1.0.3'
-  gem 'font-awesome-sass', '~> 4.3.1'
-  # jquery-rails > 3.1.2 is not compatible with rails 3
-  gem 'jquery-rails', '~> 3.1.2'
+  gem 'font-awesome-sass', '~> 4.4.0'
+  # jquery-rails > 3.1 is not compatible with rails 3
+  gem 'jquery-rails', '~> 3.1.3'
   gem 'jquery-ui-rails', '~> 5.0.5'
   gem 'momentjs-rails', '~> 2.10.2'
-  gem 'd3_rails', '~> 3.5.5'
+  gem 'd3_rails', '~> 3.5.6'
   gem 'therubyracer', '~> 0.12.1'
   gem 'uglifier', '>= 1.0.3'
   gem 'handlebars_assets', '~> 0.20.1'
@@ -51,7 +55,7 @@ gem 'indefinite_article', '~> 0.2.0'
 
 # Fancy Forms
 # simple_form >= 3.0 is not compatible with rails 3
-gem 'simple_form', '~> 2.1.1'
+gem 'simple_form', '~> 2.1'
 
 # Inherited Resources
 gem 'inherited_resources', '~> 1.4.1'
@@ -67,7 +71,7 @@ gem 'json-stream', '~> 0.2.1'
 gem 'nokogiri', '~> 1.6.6.2'
 
 # Authentication
-gem 'devise', '~> 3.4.1'
+gem 'devise', '~> 3.5.2'
 
 # Authorization
 gem 'cancan', '~> 1.6.7'
@@ -79,16 +83,16 @@ gem 'kaminari', '~> 0.16.1'
 gem "strip_attributes", "~> 1.0"
 
 # For distributed ontologies
-gem 'acts_as_tree', '~> 2.1.0'
+gem 'acts_as_tree', '~> 2.2.0'
 
 # HTTP Client
 gem "rest-client", '~> 1.8.0'
 
 # Background-Jobs
-gem 'sidekiq', '~> 3.3.2'
+gem 'sidekiq', '~> 3.4.2'
 gem 'sidetiq', '~> 0.6.3'
-gem 'sidekiq-failures', '~> 0.4.3'
-gem 'sidekiq-status', '~> 0.5.2'
+gem 'sidekiq-failures', '~> 0.4.5'
+gem 'sidekiq-status', '~> 0.5.4'
 gem 'sinatra', '~> 1.4.5', require: false, group: [:development, :production]
 
 # Search engine
@@ -102,10 +106,10 @@ gem 'elasticsearch-extensions', '~> 0.0.15'
 gem 'ruby-graphviz', "~> 1.2.2"
 
 # Fake-inputs for tests and seeds
-gem "faker", "~> 1.2"
+gem "faker", "~> 1.5.0"
 
 # Git
-gem 'rugged', '~> 0.22.0'
+gem 'rugged', '~> 0.23.2'
 gem 'codemirror-rails', github: 'llwt/codemirror-rails'
 
 # API
@@ -124,6 +128,9 @@ gem 'data_migrate', '~> 1.2.0'
 # Multi Table Inheritance. For Rails 4, mirgrate to active_record-acts_as.
 gem 'acts_as_relation', '~> 0.1.3'
 
+# Clean the database - especially needed in the seeds
+gem 'database_cleaner', '~> 1.4.1'
+
 group :test do
   gem 'mocha', '~> 1.1.0', require: false
   gem 'shoulda', '~> 3.5.0'
@@ -150,18 +157,17 @@ group :test do
 end
 
 group :development do
-  gem "rails-erd", '~> 1.4.1'
+  gem "rails-erd", '~> 1.4.2'
   gem 'quiet_assets', '~> 1.1.0'
   gem 'invoker', '~> 1.3.2'
 end
 
 group :development, :test do
-  gem 'database_cleaner', '~> 1.4.1'
   gem 'rspec-rails', '~> 2.0'
   gem 'better_errors', '~> 2.1.1'
   gem 'binding_of_caller', '~> 0.7.2'
   gem 'i18n-tasks', '~> 0.8.3'
-  gem 'pry-byebug', '~> 3.1.0'
+  gem 'pry-byebug', '~> 3.2.0'
 
   # Recording of HTTP Requests
   gem "vcr", '~> 2.9.3', require: false