Merge branch 'development' into statistics_filename_change

Author: briri

.env.mysql2

@@ -0,0 +1,48 @@
+# DMPRoadmap dotenv file
+
+# Rails log level
+RAILS_LOG_LEVEL=debug
+# Whether or not Rails should log to STDOUT. If false it will log to `./logs/[env].log`
+RAILS_LOG_TO_STDOUT=true
+# Whether or not Rails will be serving your static assets 
+RAILS_SERVE_STATIC_FILES=false
+# Maximum number of Puma threads
+RAILS_MAX_THREADS=5
+# Maximum number of Puma workers
+WEB_CONCURRENCY=2
+# The port puma will use to host the Rails app
+PORT=3000
+
+# Rails 6.1+ has a white-list of valid domains. You must set this for your production env!
+DMPROADMAP_HOST=localhost
+
+# The location of the wkhtmltopdf app. Once bundler has installed it, you can find it with
+# `which wkhtmltopdf` on linux/osx systems.
+WICKED_PDF_PATH=/usr/local/bin/wkhtmltopdf
+
+# Database settings.
+DB_ADAPTER=mysql2
+DB_HOST=localhost
+DB_PORT=3306
+DB_POOL_SIZE=16
+DB_NAME=roadmap
+
+# Whether or not the Dragonfly gem should use AWS S3 to store logos. If 'false' the logos will 
+# be stored on the local disk. If true, you must provide the `AWS_` prefixed values.
+DRAGONFLY_AWS=false
+AWS_REGION=
+AWS_BUCKET_NAME=
+
+# If you have a Rollbar account and want to redcord errors there, add your token here
+ROLLBAR_ACCESS_TOKEN=
+ROLLBAR_ENV=
+
+# Translation IO variables. The Domain can be either `app` or `client` and is typically defined
+# when running `bin/rails translations:sync DOMAIN=app`. `client` will use any of your 
+# customized content in ./app/views/branded and `app` is for the core roadmap translations.
+# Include your Translation.io API key for the appropriate domains:
+#    app => TRANSLATION_API_ROADMAP
+#    client => TRANSLATION_API_CLIENT
+# DOMAIN=app
+# TRANSLATION_API_ROADMAP=
+# TRANSLATION_API_CLIENT=

.env.postgresql

@@ -0,0 +1,48 @@
+# DMPRoadmap dotenv file
+
+# Rails log level
+RAILS_LOG_LEVEL=debug
+# Whether or not Rails should log to STDOUT. If false it will log to `./logs/[env].log`
+RAILS_LOG_TO_STDOUT=true
+# Whether or not Rails will be serving your static assets 
+RAILS_SERVE_STATIC_FILES=false
+# Maximum number of Puma threads
+RAILS_MAX_THREADS=5
+# Maximum number of Puma workers
+WEB_CONCURRENCY=2
+# The port puma will use to host the Rails app
+PORT=3000
+
+# Rails 6.1+ has a white-list of valid domains. You must set this for your production env!
+DMPROADMAP_HOST=localhost
+
+# The location of the wkhtmltopdf app. Once bundler has installed it, you can find it with
+# `which wkhtmltopdf` on linux/osx systems.
+WICKED_PDF_PATH=/usr/local/bin/wkhtmltopdf
+
+# Database settings.
+DB_ADAPTER=postgresql
+DB_HOST=localhost
+DB_PORT=5432
+DB_POOL_SIZE=16
+DB_NAME=roadmap
+
+# Whether or not the Dragonfly gem should use AWS S3 to store logos. If 'false' the logos will 
+# be stored on the local disk. If true, you must provide the `AWS_` prefixed values.
+DRAGONFLY_AWS=false
+AWS_REGION=
+AWS_BUCKET_NAME=
+
+# If you have a Rollbar account and want to redcord errors there, add your token here
+ROLLBAR_ACCESS_TOKEN=
+ROLLBAR_ENV=
+
+# Translation IO variables. The Domain can be either `app` or `client` and is typically defined
+# when running `bin/rails translations:sync DOMAIN=app`. `client` will use any of your 
+# customized content in ./app/views/branded and `app` is for the core roadmap translations.
+# Include your Translation.io API key for the appropriate domains:
+#    app => TRANSLATION_API_ROADMAP
+#    client => TRANSLATION_API_CLIENT
+DOMAIN=app
+TRANSLATION_API_ROADMAP=
+TRANSLATION_API_CLIENT=

.github/workflows/brakeman.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   brakeman:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/eslint.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   eslint:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
     # Checkout the repo

.github/workflows/mysql.yml

@@ -4,7 +4,7 @@ on: [pull_request]
 
 jobs:
   mysql:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     # Define environment variables for MySQL and Rails
     env:
@@ -28,15 +28,16 @@ jobs:
         cache: 'yarn'
 
     # Copy all of the example configs over
-    - name: 'Setup Default Configuration'
+    - name: 'Setup the application'
       run: |
         cp config/database.yml.sample config/database.yml
         cp config/initializers/contact_us.rb.example config/initializers/contact_us.rb
         cp config/initializers/wicked_pdf.rb.example config/initializers/wicked_pdf.rb
+        cp .env.mysql2 .env
 
     # Stub out the Rails credentials file so that we can start the Rails app
     - name: 'Setup Credentials'
-      run: EDITOR='echo "$(cat config/credentials.yml.example)" >' bundle exec rails credentials:edit
+      run: EDITOR='echo "$(cat config/credentials.yml.mysql2)" >' bundle exec rails credentials:edit
 
     # Set the path to the wkhtmltopdf executable
     - name: 'Determine wkhtmltopdf location'

.github/workflows/postgres.yml

@@ -4,7 +4,7 @@ on: [pull_request]
 
 jobs:
   postgresql:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     services:
       # Postgres installation
@@ -55,12 +55,13 @@ jobs:
         cp config/database.yml.sample config/database.yml
         cp config/initializers/contact_us.rb.example config/initializers/contact_us.rb
         cp config/initializers/wicked_pdf.rb.example config/initializers/wicked_pdf.rb
+        cp .env.postgresql .env
 
     # Stub out the Rails credentials file so that we can start the Rails app
     - name: 'Setup Credentials'
       run: |
         # generate a default credential file and key
-        EDITOR='echo "$(cat config/credentials.yml.example)" >' bundle exec rails credentials:edit
+        EDITOR='echo "$(cat config/credentials.yml.postgresql)" >' bundle exec rails credentials:edit
 
     # Set the path to the wkhtmltopdf executable
     - name: 'Determine wkhtmltopdf location'

.github/workflows/rubocop.yml

@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   rubocop:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
     # Checkout the repo

Gemfile.lock

@@ -268,6 +268,8 @@ GEM
     mysql2 (0.5.4)
     nenv (0.3.0)
     nio4r (2.5.8)
+    nokogiri (1.13.9-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -498,6 +500,7 @@ GEM
     zeitwerk (2.6.1)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
@@ -580,4 +583,4 @@ RUBY VERSION
    ruby 2.7.6p219
 
 BUNDLED WITH
-   2.3.15
+   2.3.24

app/views/contributors/_form.html.erb

@@ -80,7 +80,8 @@ roles_tooltip = _("Select each role that applies to the contributor.")
             <%= form.check_box hash.keys.first.to_sym,
                                value: hash.values.first,
                                data: { toggle: "tooltip" },
-                               title: ContributorPresenter.role_tooltip(symbol: hash.keys.first) %>
+                               title: ContributorPresenter.role_tooltip(symbol: hash.keys.first),
+                               aria: { label: ContributorPresenter.role_symbol_to_string(symbol: hash.keys.first) } %>
             <%= ContributorPresenter.role_symbol_to_string(symbol: hash.keys.first) %>
           </div>
         </div>

app/views/layouts/application.html.erb

@@ -101,7 +101,6 @@
         <div class="spinner-border hidden" role="status">
           <%spinner_msg = _("Loading...") %>
           <%= image_tag("spinner.gif", alt: spinner_msg) %>
-          <span class="sr-only"><%= spinner_msg %></span>
         </div>
 
       </main>