Merge pull request #278 from CDLUC3/development

Pulling in latest changes for the new release (and new infrastructure)

.github/workflows/eslint.yml

@@ -9,7 +9,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-
     - name: Install modules
       run: yarn
 

.github/workflows/mysql.yml

@@ -28,7 +28,7 @@ jobs:
         echo "BUNDLER_VERSION=`cat ./Gemfile.lock | grep -A 1 'BUNDLED WITH' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV
 
     - name: 'Install Ruby'
-      uses: actions/setup-ruby@v1
+      uses: ruby/setup-ruby@v1.68.0
       with:
         ruby-version: ${{ env.RUBY_VERSION }}
 
@@ -43,7 +43,7 @@ jobs:
 
     # Try to retrieve the gems from the cache
     - name: 'Cache Gems'
-      uses: actions/cache@v1
+      uses: actions/cache@v2.1.5
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}

.gitignore

@@ -15,6 +15,11 @@ app/assets/images/homepage
 
 # Ignore bundler config
 /.bundle
+/ruby
+/vendor
+
+# Ignore locally build bundle outputs
+/ruby
 
 # Ignore all logfiles, tempfiles, public assets,
 /log/*.log
@@ -27,6 +32,9 @@ public/*.png
 # Ignore .bak files
 *.bak
 
+# Ignore vim backup files
+*.swp
+
 # Ignore public subdirectories
 # public/*
 public/apidocs/*
@@ -99,8 +107,10 @@ spec/examples.txt
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key
+/config/credentials.yml
 /config/credentials*.yml.enc
 /config/credentials/
+/config/secrets.yml
 
 /public/packs
 /public/packs-test

Gemfile

@@ -57,6 +57,17 @@ gem "bootsnap", require: false
 # (http://github.com/plataformatec/responders)
 # gem "responders"
 
+# ============= #
+# CONFIGURATION #
+# ============= #
+
+# Anyway Config is a configuration library for Ruby gems and applications.
+gem "anyway_config"
+
+# Our homegrown artisinal SSM gem
+# gem "uc3-ssm", git: "https://github.com/CDLUC3/uc3-ssm", branch: "0.3.0rc0"
+gem "uc3-ssm", git: "https://github.com/CDLUC3/uc3-ssm", branch: "add-support-for-paging"
+
 # ============== #
 # ERROR HANDLING #
 # ============== #
@@ -113,7 +124,12 @@ gem "omniauth-orcid"
 #   https://nvd.nist.gov/vuln/detail/CVE-2015-9284
 gem "omniauth-rails_csrf_protection"
 
+# Doorkeeper is a gem (Rails engine) that makes it easy to introduce OAuth 2 provider functionality
+# to your Ruby on Rails or Grape application. https://github.com/doorkeeper-gem/doorkeeper
+gem "doorkeeper", "~> 5.5"
+
 # A ruby implementation of the RFC 7519 OAuth JSON Web Token (JWT) standard.
+# https://github.com/jwt/ruby-jwt
 gem "jwt"
 
 # Gems for repository integration

Gemfile.lock

@@ -1,3 +1,13 @@
+GIT
+  remote: https://github.com/CDLUC3/uc3-ssm
+  revision: 677451c275bc23b59dc76085ca571ebbac6dafd4
+  branch: add-support-for-paging
+  specs:
+    uc3-ssm (0.3.0)
+      aws-sdk-ssm (~> 1.84)
+      logger (~> 1.4)
+      yaml (~> 0.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -51,11 +61,25 @@ GEM
       rake (>= 10.4, < 14.0)
     annotate_gem (0.0.14)
       bundler (>= 1.1)
+    anyway_config (2.1.0)
+      ruby-next-core (>= 0.11.0)
     api-pagination (4.8.2)
     arel (9.0.0)
     ast (2.4.2)
     autoprefixer-rails (10.2.5.1)
       execjs (> 0)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.466.0)
+    aws-sdk-core (3.114.2)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-ssm (1.111.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.3)
+      aws-eventstream (~> 1, >= 1.0.2)
     bcrypt (3.1.16)
     better_errors (2.8.1)
       coderay (>= 1.0.0)
@@ -113,6 +137,7 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
+    csv (3.2.0)
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
     database_cleaner-active_record (2.0.1)
@@ -131,6 +156,8 @@ GEM
       devise (>= 4.6)
     diff-lcs (1.4.4)
     docile (1.4.0)
+    doorkeeper (5.5.1)
+      railties (>= 5)
     dotenv (2.7.6)
     dotenv-rails (2.7.6)
       dotenv (= 2.7.6)
@@ -189,8 +216,9 @@ GEM
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    gettext (3.3.7)
+    gettext (3.3.8)
       locale (>= 2.0.5)
+      red-datasets
       text (>= 1.3.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -223,6 +251,7 @@ GEM
     ipaddress (0.8.3)
     jbuilder (2.11.2)
       activesupport (>= 5.0.0)
+    jmespath (1.4.0)
     json (2.5.1)
     jwt (2.2.3)
     kaminari (1.2.1)
@@ -245,6 +274,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     locale (2.1.3)
+    logger (1.4.3)
     loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -361,6 +391,10 @@ GEM
       ffi (~> 1.0)
     recaptcha (5.8.0)
       json
+    red-datasets (0.1.2)
+      csv (>= 3.0.5)
+      rexml
+      rubyzip
     regexp_parser (2.1.1)
     responders (3.0.1)
       actionpack (>= 5.0)
@@ -390,7 +424,7 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    rubocop (1.16.0)
+    rubocop (1.16.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -424,6 +458,7 @@ GEM
     rubocop-rspec (2.3.0)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
+    ruby-next-core (0.12.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.4)
     ruby_dig (0.0.2)
@@ -514,6 +549,7 @@ GEM
     wkhtmltopdf-binary (0.12.4)
     xpath (3.2.0)
       nokogiri (~> 1.8)
+    yaml (0.1.1)
     yard (0.9.26)
     yard-tomdoc (0.7.1)
       tomparse (>= 0.4.0)
@@ -526,6 +562,7 @@ PLATFORMS
 DEPENDENCIES
   annotate
   annotate_gem
+  anyway_config
   api-pagination
   autoprefixer-rails
   better_errors (= 2.8.1)
@@ -544,6 +581,7 @@ DEPENDENCIES
   database_cleaner
   devise
   devise_invitable
+  doorkeeper (~> 5.5)
   dotenv-rails
   dragonfly
   dragonfly-s3_data_store
@@ -593,6 +631,7 @@ DEPENDENCIES
   text
   translation
   turbolinks
+  uc3-ssm!
   web-console
   webdrivers
   webmock

README.md

@@ -23,8 +23,8 @@ See the [Translations Guide](https://github.com/DMPRoadmap/roadmap/wiki/Translat
 
 #### Pre-requisites
 Roadmap is a Ruby on Rails application and you will need to have:
-* Ruby = 2.4.0 - 2.4.4
-* Rails = 4.2
+* Ruby = 2.6.3
+* Rails = 5.2
 * MySQL >= 5.0 OR PostgreSQL
 
 ## Installation

app/assets/stylesheets/tinymce.css

@@ -0,0 +1,5 @@
+.mce-content-body {
+  a {
+    color: #000;
+  }
+}