Merge branch 'develop' into 937/xray-configurable

uclibs · Feb 15, 2022 · c5728b9 · c5728b9
2 parents 49e268d + cbc27c1
commit c5728b9
Show file tree

Hide file tree

Showing 33 changed files with 481 additions and 520 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ jobs:
         parameters:
             ruby_version:
                 type: string
-                default: 2.7.2
+                default: 2.7.5
             bundler_version:
                 type: string
                 default: 2.0.1
@@ -90,4 +90,4 @@ workflows:
     ci:
         jobs:
             - build:
-                name: ruby2-7-2
+                name: ruby2-7-5
diff --git a/.env.development b/.env.development
@@ -44,10 +44,6 @@ SCHOLAR_ANALYTICS_PRIVKEY_PATH=analytics_privkey_path
 SCHOLAR_ANALYTICS_PRIVKEY_SECRET=analytics_privkey_secret
 SCHOLAR_ANALYTICS_CLIENT_EMAIL=analytics_client_email
 
-# Google Re-captcha
-SCHOLAR_CAPTCHA_SITE_KEY=captcha_site_key
-SCHOLAR_CAPTCHA_SECRET_KEY=captcha_secret_key
-
 # ORCID
 ORCID_AUTHORIZE_URL=change_me
 ORCID_APP_ID=change_me

diff --git a/.env.test b/.env.test
@@ -43,10 +43,6 @@ SCHOLAR_ANALYTICS_PRIVKEY_PATH=analytics_privkey_path
 SCHOLAR_ANALYTICS_PRIVKEY_SECRET=analytics_privkey_secret
 SCHOLAR_ANALYTICS_CLIENT_EMAIL=analytics_client_email
 
-# Google Re-captcha
-SCHOLAR_CAPTCHA_SITE_KEY=captcha_site_key
-SCHOLAR_CAPTCHA_SECRET_KEY=captcha_secret_key
-
 # ORCID
 ORCID_AUTHORIZE_URL=change_me
 ORCID_APP_ID=change_me
@@ -77,4 +73,4 @@ SCHOLAR_DOI_URL=https://api.test.datacite.org/dois
 API_KEY={ :development => 'testKey'}
 
 # XRay max log size in MB, must be an integer value
-SCHOLAR_XRAY_MAX_LOG_SIZE=10
+SCHOLAR_XRAY_MAX_LOG_SIZE=10
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -200,6 +200,7 @@ RSpec/ExampleLength:
     - 'app/api/**/*'
     - 'spec/api/*'
     - 'spec/unit/permission_spec.rb'
+    - 'spec/controllers/hyrax/resource_sync_controller_spec.rb'
 
 RSpec/ExpectActual:
   Enabled: false

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.7.2
+2.7.5
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.5.5
+FROM ruby:2.7.5
 
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM ruby:2.5.5
+FROM ruby:2.7.5
 
 ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8

diff --git a/Gemfile b/Gemfile
@@ -11,12 +11,12 @@ end
 gem 'bigdecimal', '1.3.5'
 
 # For BrowseEverything to work with Hyrax 2.x then we need to pin BE
-gem 'browse-everything', '1.0.2'
+gem 'browse-everything', '1.1.0'
 
 gem 'bulkrax', git: 'https://github.com/uclibs/bulkrax.git', ref: '4ad295999ff6c2f095ad3dc2fa67cd9a05f6b77f'
 gem 'hydra-remote_identifier', github: 'uclibs/hydra-remote_identifier', branch: 'scholar-datacite'
 gem 'kaltura', '0.1.1'
-gem 'rack', '2.0.8'
+gem 'rack', '2.2.3'
 gem 'sidekiq-limit_fetch'
 gem 'willow_sword', github: 'notch8/willow_sword'
 
@@ -25,7 +25,7 @@ gem 'rails', '~> 5.1.7'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '1.3.13'
 # Use Puma as the app server
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 4.3.8'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
@@ -67,7 +67,7 @@ gem 'equivalent-xml'
 gem 'grape'
 gem 'grape_on_rails_routes'
 gem 'hydra-role-management'
-gem 'hyrax', '2.9.4'
+gem 'hyrax', '2.9.6'
 gem 'mysql2', '~> 0.4.10'
 gem 'omniauth-openid'
 gem 'omniauth-shibboleth'