Merge pull request #79 from sanger/staging

Merge Staging into Master

Author: jbeast

.travis.yml

@@ -7,3 +7,19 @@ before_script:
   - bundle exec rake db:reset
   - bundle exec rake db:setup
 script: bundle exec rspec
+
+sudo: false
+
+cache:
+  directories:
+    - "travis_phantomjs"
+
+before_install:
+  - "phantomjs --version"
+  - "export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH"
+  - "hash -d phantomjs || true"
+  - "phantomjs --version"
+  - "if [ $(phantomjs --version) != '2.1.1' ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
+  - "if [ $(phantomjs --version) != '2.1.1' ]; then wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2; fi"
+  - "if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
+  - "phantomjs --version"

Gemfile

@@ -29,7 +29,7 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 
 gem 'puma'
 
-gem 'active_model_serializers', '~> 0.10.0.rc4'
+gem 'active_model_serializers', '~> 0.10.6'
 
 gem 'bootstrap-sass', '~> 3.3.6'
 gem "font-awesome-rails"
@@ -57,9 +57,6 @@ group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
 
-  # Access an IRB console on exception pages or by using <%= console %> in views
-  gem 'web-console', '~> 2.0'
-
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
 
@@ -90,5 +87,10 @@ end
 group :deployment do
   gem 'therubyracer'
   gem 'mysql2', '0.3.20'
+
 end
 
+group :development do
+  # Access an IRB console on exception pages or by using <%= console %> in views
+  gem 'web-console', '~> 2.0'
+end