Merge branch 'staging'

.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 2.1.1
+  - 2.1
 
 branches:
   except:

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 3.2.13'
+gem 'rails', '~> 3.2.19'
 gem 'rack-protection'
 gem 'secure_headers'
 
@@ -30,12 +30,13 @@ group :assets do
   gem 'uglifier', '>= 1.0.3'
   gem 'handlebars_assets', '~> 0.14.1'
   gem 'hamlbars', '~> 2.0'
+  gem 'underscore-rails', '~> 1.6.0'
 end
 
 gem 'haml-rails'
 
 # Project configuration
-gem 'rails_config'
+gem 'rails_config', '~> 0.3.0'
 
 # Fancy Forms
 gem 'simple_form'
@@ -69,8 +70,8 @@ gem 'acts_as_tree'
 gem "rest-client"
 
 # Background-Jobs
-gem 'sidekiq', '~> 2.17'
-gem 'sidetiq', '~> 0.5'
+gem 'sidekiq', '~> 3.1'
+gem 'sidetiq'
 gem 'sidekiq-failures'
 gem 'sinatra', require: false, group: [:development, :production]
 
@@ -106,20 +107,24 @@ group :test do
   gem "capybara"
   gem "capybara-webkit"
   gem "launchy"
-  
+
   # Recording of HTTP Requests
   gem "vcr"
   gem "webmock", '~> 1.9.0'
 
   # Code Coverage Analysis
   gem 'coveralls', require: false
+
+  # Writing test ontologies
+  gem 'ontology-united', github: '0robustus1/ontology-united'
 end
 
 group :development do
   # pre-packaged Solr distribution for use in development
   gem 'sunspot_solr', :git => 'git://github.com/digineo/sunspot.git'
   gem "rails-erd"
   gem 'quiet_assets'
+  gem 'invoker', '~> 1.2.0'
 end
 
 group :development, :test do