Merge branch 'master' into mutlitenancy_in_test

.ebextensions/fits.config

@@ -1,8 +1,8 @@
 sources:
-  /opt/fits: http://s3.amazonaws.com/hybox-deployment-artifacts/fits-0.10.2.zip
+  /opt/fits: http://s3.amazonaws.com/hybox-deployment-artifacts/fits-1.1.0.zip
 
 container_commands:
   01_symlink_fits:
-    command: ln -sf /opt/fits/fits-0.10.2/fits.sh /usr/local/bin/fits.sh
+    command: ln -sf /opt/fits/fits-1.1.0/fits.sh /usr/local/bin/fits.sh
   02_chmod_fits:
-    command: chmod a+x /opt/fits/fits-0.10.2/*.sh
+    command: chmod a+x /opt/fits/fits-1.1.0/*.sh

.ebextensions/logzio.config

@@ -118,7 +118,7 @@ commands:
     command: "mkdir -p /etc/pki/tls/certs"
     cwd: /home/ec2-user
   3_download_cert:
-    command: "wget https://raw.githubusercontent.com/cloudflare/cfssl_trust/master/certdata/intermediate_ca/COMODORSADomainValidationSecureServerCA.crt"
+    command: "wget https://raw.githubusercontent.com/logzio/public-certificates/master/COMODORSADomainValidationSecureServerCA.crt"
     cwd: /etc/pki/tls/certs
   4_install_filebeat:
     command: "yum -y install filebeat"

.travis.yml

@@ -4,7 +4,7 @@ notifications:
   email: false
 dist: trusty
 rvm:
-  - 2.4.0
+  - 2.4.1
 
 # We provide AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY encrypted by travis here
 env:

Dockerfile

@@ -3,8 +3,8 @@ RUN apt-get update -qq && \
     apt-get install -y build-essential libpq-dev nodejs libreoffice imagemagick unzip && \
     rm -rf /var/lib/apt/lists/*
 RUN mkdir -p /opt/fits && \
-    curl -fSL -o /opt/fits-0.6.2.zip http://projects.iq.harvard.edu/files/fits/files/fits-0.6.2.zip && \
-    cd /opt && unzip fits-0.6.2.zip && chmod +X fits-0.6.2/fits.sh
+    curl -fSL -o /opt/fits-1.1.0.zip http://projects.iq.harvard.edu/files/fits/files/fits-1.1.0.zip && \
+    cd /opt && unzip fits-1.1.0.zip && chmod +X fits-1.1.0/fits.sh
 
 RUN mkdir /data
 WORKDIR /data
@@ -14,4 +14,3 @@ RUN bundle install
 ADD . /data
 RUN bundle exec rake assets:precompile
 EXPOSE 3000
-

Gemfile

@@ -38,13 +38,13 @@ group :development, :test do
 
   gem 'i18n-debug', require: false
   gem 'rspec'
-  gem 'rspec-rails', '>= 3.6.0.beta2'
+  gem 'rspec-rails', '>= 3.6.0'
 
   gem 'coveralls', require: false
   gem 'simplecov', require: false
 
   gem 'fcrepo_wrapper', '~> 0.4'
-  gem 'solr_wrapper', '~> 0.10'
+  gem 'solr_wrapper', '~> 1.0'
 
   gem 'rubocop', '~> 0.47.0'
   gem 'rubocop-rspec', '~> 1.10.0'
@@ -72,7 +72,7 @@ end
 gem 'blacklight', '~> 6.7'
 
 gem 'hyrax', git: 'https://github.com/projecthydra-labs/hyrax.git'
-gem 'rsolr', '~> 1.1.2'
+gem 'rsolr', '~> 2.0'
 
 gem 'devise'
 gem 'devise-guests', '~> 0.3'
@@ -103,20 +103,19 @@ gem 'zk'
 gem 'mods', '~> 2.1'
 gem 'riiif', '~> 1.1'
 
-gem 'iiif_manifest', '~> 0.1.2'
+gem 'iiif_manifest', '~> 0.2.0'
 
 group :aws, :test do
   gem 'carrierwave-aws'
 end
 
 group :aws do
-  # TODO: Version 2.0 causes a failure in spec/lib/active_job/queue_adapters/better_active_elastic_job_adapter_spec.rb
-  gem 'active_elastic_job', '~> 1.7'
+  gem 'active_elastic_job', '~> 2.0'
 end
 
 gem 'peek-sidekiq'
 gem 'sidekiq'
 
 gem 'secure_headers'
 
-gem 'honeybadger', '~> 2.0'
+gem 'honeybadger', '~> 3.0'