Merge pull request #4329 from avalonmediasystem/staging

7.2 Release

.codeclimate.yml

@@ -1,11 +1,11 @@
 ---
 prepare:
- fetch:
- - url: "https://raw.githubusercontent.com/samvera-labs/bixby/master/bixby_default.yml"
+ fetch: # Pinned to bixby 2.0.0
+ - url: "https://raw.githubusercontent.com/samvera-labs/bixby/394ba20eac3f3c8146a679b1dc45c3513074848c/bixby_default.yml"
  path: "bixby_default.yml"
- - url: "https://raw.githubusercontent.com/samvera-labs/bixby/master/bixby_rails_enabled.yml"
+ - url: "https://raw.githubusercontent.com/samvera-labs/bixby/394ba20eac3f3c8146a679b1dc45c3513074848c/bixby_rails_enabled.yml"
  path: "bixby_rails_enabled.yml"
- - url: "https://raw.githubusercontent.com/samvera-labs/bixby/master/bixby_rspec_enabled.yml"
+ - url: "https://raw.githubusercontent.com/samvera-labs/bixby/394ba20eac3f3c8146a679b1dc45c3513074848c/bixby_rspec_enabled.yml"
  path: "bixby_rspec_enabled.yml"
 engines:
  brakeman:

.gitignore

@@ -73,6 +73,11 @@ yarn-debug.log*
 /yarn-error.log
 yarn-debug.log*
 .yarn-integrity
+.pnp
 
 # Cypress test output
-/cypress
+/cypress
+
+# ActiveStorage
+/storage
+/tmp/storage

Capfile

@@ -3,6 +3,8 @@ require "capistrano/setup"
 
 # Include default deployment tasks
 require "capistrano/deploy"
+require "capistrano/scm/git"
+install_plugin Capistrano::SCM::Git
 
 require 'capistrano/rvm'
 require 'capistrano/bundler'
@@ -11,7 +13,6 @@ require 'capistrano/rails/migrations'
 require 'capistrano/passenger'
 require 'capistrano-sidekiq'
 require 'capistrano/yarn'
-require "whenever/capistrano"
 
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
 Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }

Dockerfile

@@ -7,6 +7,7 @@ RUN echo "deb http://deb.debian.org/debian stretch-backports main" >> /e
  pkg-config \
  zip \
  git \
+ libyaz-dev \
  && rm -rf /var/lib/apt/lists/* \
  && apt-get clean
 
@@ -55,6 +56,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends --allow
  openssh-client \
  zip \
  dumb-init \
+ libyaz-dev \
  && ln -s /usr/bin/lsof /usr/sbin/
 
 

Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Core rails
 gem 'bootsnap', require: false
 gem 'listen'
-gem 'rails', '=5.2.4.3'
+gem 'rails', '=5.2.4.4'
 gem 'sprockets', '~>3.7.2'
 gem 'sqlite3'
 
@@ -88,15 +88,16 @@ gem 'mediaelement-track-scrubber', git: 'https://github.com/avalonmediasystem/me
 
 # Jobs
 gem 'activejob-traffic_control'
+gem 'activejob-uniqueness'
 gem 'redis-rails'
 gem 'sidekiq', '~> 5.2.7'
+gem 'sidekiq-cron', '~> 1.2'
 
 # Coding Patterns
 gem 'config'
 gem 'hooks'
 gem 'jbuilder', '~> 2.0'
 gem 'parallel'
-gem 'whenever', '~> 0.11', require: false
 gem 'with_locking'
 
 group :development do
@@ -135,6 +136,7 @@ group :test do
  gem 'faker'
  gem 'hashdiff'
  gem 'rails-controller-testing'
+ gem 'rspec-its'
  gem 'rspec-retry'
  gem 'rspec_junit_formatter'
  gem 'selenium-webdriver'
@@ -147,14 +149,21 @@ end
 group :production do
  gem 'google-analytics-rails', '1.1.0'
  gem 'lograge'
+ gem 'okcomputer'
  gem 'puma'
 end
 
 # Install the bundle --with aws when running on Amazon Elastic Beanstalk
 group :aws, optional: true do
- gem 'active_elastic_job', '~> 2.0'
- gem 'aws-sdk', '~> 2.0'
+ gem 'active_elastic_job', github: 'tawan/active-elastic-job'
+ gem 'aws-partitions'
  gem 'aws-sdk-rails'
+ gem 'aws-sdk-cloudfront'
+ gem 'aws-sdk-elastictranscoder'
+ gem 'aws-sdk-s3'
+ gem 'aws-sdk-ses'
+ gem 'aws-sdk-sqs'
+ gem 'aws-sigv4'
  gem 'cloudfront-signer'
  gem 'zk'
 end