Skip to content
Merged

V4.0.1 #3252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
9154780
some accessibility fixes discovered during audit of dmptool. mostly m…
briri Sep 28, 2022
68e914c
Merge pull request #3228 from DMPRoadmap/main
briri Oct 27, 2022
cd6fed4
updated bin/setup so that its simpler to install the system
briri Oct 27, 2022
add60e2
removed unused files and reverted schema.rb
briri Oct 27, 2022
5a8ab0b
updated github actions to work with changed sample config files. some…
briri Oct 28, 2022
53fa945
revert some rubocop changes since they were auto-corrected with the w…
briri Oct 28, 2022
51bd0a9
fix YAML safe load capatibility potential error
pengyin-shan Nov 4, 2022
3e5c7c7
move common config setting to application.rb
pengyin-shan Nov 4, 2022
680a680
Merge branch 'development' into accessibility-fixes
briri Nov 7, 2022
6402f59
attempt to make setup work with Windows
briri Nov 8, 2022
77da243
add translation format for feedback notification page
pengyin-shan Nov 14, 2022
edf0b5b
add translation format for at_csv.rb
pengyin-shan Nov 14, 2022
9ac45a3
fix rubocop
pengyin-shan Nov 14, 2022
f338806
update webdriver to 5.2 for a webdriver bug on M-powered Mac
pengyin-shan Nov 14, 2022
acd8fa0
add tranlsation formats for usage section
pengyin-shan Nov 15, 2022
67cd052
move the <p> tag out of translation section
pengyin-shan Nov 15, 2022
820d21e
switched from db:prepare to db:create
briri Nov 17, 2022
b283674
Created editorconfig file
benjaminfaure Nov 21, 2022
cef8c3c
remove the extra Affiliation row in csv download
pengyin-shan Nov 23, 2022
e0fe690
change github action ubuntu version to ubuntu-20.04 instead of ubuntu…
pengyin-shan Nov 23, 2022
2e6dc4b
fix routes.rb to replace some double quotes with single quotes
pengyin-shan Nov 25, 2022
71d0063
Merge pull request #3248 from DMPRoadmap/fix_3247
pengyin-shan Nov 25, 2022
94c0b32
Merge branch 'development' into accessibility-fixes
briri Nov 28, 2022
8dc8b75
fixed typo in research_outputs view
briri Nov 28, 2022
22e9c64
fixed typo in textarea question view
briri Nov 28, 2022
337b927
Merge pull request #3213 from DMPRoadmap/accessibility-fixes
briri Nov 29, 2022
dc71394
Merge branch 'development' into install-update
briri Nov 29, 2022
57f1649
Merge pull request #3229 from DMPRoadmap/install-update
briri Nov 29, 2022
7e85f10
Merge branch 'development' into fix_double_quotes_routes
briri Nov 29, 2022
42a2b2e
Merge branch 'development' into remove_extra_affiliation
briri Nov 29, 2022
1103d22
Merge branch 'development' into editorconfig
briri Nov 29, 2022
3942501
Merge branch 'development' into add_translation
briri Nov 29, 2022
144676d
Merge branch 'development' into add_translation_feedback_notification
briri Nov 29, 2022
227ac57
Merge branch 'development' into webdriver_update
pengyin-shan Nov 29, 2022
4f89e7c
Merge pull request #3236 from DMPRoadmap/webdriver_update
pengyin-shan Nov 29, 2022
1182f63
Merge branch 'development' into remove_extra_affiliation
pengyin-shan Nov 29, 2022
04fdd61
Merge branch 'development' into add_translation
pengyin-shan Nov 29, 2022
3e5a9f2
Merge branch 'development' into add_symbol_to_safe_yaml_list
pengyin-shan Nov 29, 2022
a3323b5
Merge branch 'development' into add_translation_feedback_notification
pengyin-shan Nov 29, 2022
cd49f69
Merge branch 'development' into editorconfig
pengyin-shan Nov 29, 2022
adf977a
Merge branch 'development' into fix_double_quotes_routes
pengyin-shan Nov 29, 2022
270b1b1
Merge pull request #3246 from DMPRoadmap/remove_extra_affiliation
pengyin-shan Nov 29, 2022
ea02c35
Merge pull request #3234 from DMPRoadmap/add_translation_feedback_not…
pengyin-shan Nov 29, 2022
2092d80
Merge branch 'development' into add_symbol_to_safe_yaml_list
pengyin-shan Nov 29, 2022
cc4af48
Merge pull request #3235 from DMPRoadmap/add_translation
pengyin-shan Nov 29, 2022
ee2b836
Merge pull request #3250 from DMPRoadmap/fix_double_quotes_routes
pengyin-shan Nov 29, 2022
8243935
Merge branch 'development' into editorconfig
pengyin-shan Nov 29, 2022
2277cea
Merge pull request #3243 from benjaminfaure/editorconfig
pengyin-shan Nov 29, 2022
a814d68
Merge pull request #3231 from DMPRoadmap/add_symbol_to_safe_yaml_list
pengyin-shan Nov 29, 2022
c6e68cc
bundle, yarn update and translation.io update
pengyin-shan Nov 30, 2022
a3b3a4c
fix rubocop
pengyin-shan Nov 30, 2022
f2d8824
Merge pull request #3251 from DMPRoadmap/pre-4.0.1-release
pengyin-shan Nov 30, 2022
47a3029
Merge branch 'main' into development
pengyin-shan Nov 30, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true


# Matches multiple files with brace expansion notation
# Set default charset
[*.{js,rb,erb}]
charset = utf-8
indent_style = space
indent_size = 2
48 changes: 48 additions & 0 deletions .env.mysql2
Original file line number Diff line number Diff line change
@@ -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=
48 changes: 48 additions & 0 deletions .env.postgresql
Original file line number Diff line number Diff line change
@@ -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=
2 changes: 1 addition & 1 deletion .github/workflows/brakeman.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
brakeman:

runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push, pull_request]
jobs:
eslint:

runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
# Checkout the repo
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [pull_request]

jobs:
postgresql:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

services:
# Postgres installation
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]

jobs:
rubocop:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

steps:
# Checkout the repo
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ group :test do
gem 'capybara'
gem 'selenium-webdriver'
# Easy installation and use of web drivers to run system tests with browsers
gem 'webdrivers'
gem 'webdrivers', '~> 5.2'

# Automatically create snapshots when Cucumber steps fail with Capybara
# and Rails (http://github.com/mattheworiordan/capybara-screenshot)
Expand Down
Loading