Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
f5fd65a
Upgraded TinyMCE to V5
benjaminfaure May 4, 2022
e540504
Updated Rails to V6 & various code fixes following update
benjaminfaure May 9, 2022
f3ddfec
do not repeat help instructions for every guidance group
nicolasfranck May 11, 2022
bebc621
Feature #3063 - Feature to be able to configure whether the download
May 12, 2022
8fb9200
Merge pull request #3175 from DMPRoadmap/feature_3063_configure_proje…
briri May 12, 2022
797e664
add contributor to coversheet and add plan title to csv export
pengyin-shan May 20, 2022
1ee4c7a
run robocup auto correct
pengyin-shan May 20, 2022
9120ccb
remove Metrics/MethodLength, Metrics/AbcSize check for prepare_covers…
pengyin-shan May 20, 2022
c859b41
disable rubocop size check
pengyin-shan May 20, 2022
195e164
rubocop auto correct
pengyin-shan May 20, 2022
4c06c46
Merge branch 'master' into development
briri May 26, 2022
e914ad8
update to seeds to prevent duplicate records
Jun 1, 2022
80523ae
Merge branch 'master' into rails_6
Jun 1, 2022
0fc01e0
added logic to allow us to configure the hostname via an environment …
Jun 1, 2022
262dd58
Updated config to use Rails 6.1 defaults. Configured eager load paths…
Jun 2, 2022
6a3bb7f
switched all occurrences of 'update_attributes' to 'update' since tha…
Jun 2, 2022
015cb8a
fixed issue with the :links attribute on templates and orgs being def…
Jun 2, 2022
0548b08
fixed issue with the :links attribute on templates and orgs being def…
Jun 2, 2022
c58a412
fixed issue with accessing Languages table in initializer
Jun 2, 2022
c700ad5
Merge pull request #3178 from pengyin-shan/development
briri Jun 3, 2022
0099a85
Merge branch 'development' into fix_org_admin_multiple_theme_help
briri Jun 3, 2022
6f6dc18
Merge pull request #3173 from nicolasfranck/fix_org_admin_multiple_th…
briri Jun 3, 2022
a00e4c2
Merge branch 'development' into feature/tinymce-V5
briri Jun 3, 2022
91581a8
Merge pull request #3169 from benjaminfaure/feature/tinymce-V5
briri Jun 3, 2022
5257a83
Imported Tinymce Oxide skin CSS into public folder and removed older …
benjaminfaure Jun 7, 2022
47a8907
Renamed default role method in contributor model as it triggered Acti…
benjaminfaure Jun 7, 2022
b5656fd
Fixed 'missing attribute: modifiable' when TemplatesController#show i…
benjaminfaure Jun 7, 2022
1eec4f5
Fixed template visibility tests
benjaminfaure Jun 7, 2022
ea947f3
Fixed LocaleService#to_gettext test when locale is nil
benjaminfaure Jun 7, 2022
465eb62
Fixed UnknownFormat Exceoption when using Repositories/MetadataStanda…
benjaminfaure Jun 10, 2022
2273b60
Solved issue with visibility attribution in Plan test factory
benjaminfaure Jun 10, 2022
d448bdb
Rubocoped config files
benjaminfaure Jun 10, 2022
b98d081
fixes for rails upgrade
Jun 13, 2022
35be855
Merge branch 'changes' into rails_6
Jun 13, 2022
89d2ff1
fixed some issues with tests
Jun 13, 2022
29b93e2
reverted change to Gemfile
Jun 13, 2022
9d65c7e
breaking apart github workflow for mysql to try and determine issue w…
briri Jun 13, 2022
4ca2450
tweak to mysql github file
briri Jun 13, 2022
193c891
fix for rubocop
briri Jun 13, 2022
240410f
revert change to model specs for case sensitivity'
briri Jun 13, 2022
1c5a2d1
update to flagshihtzu definitions to handle calls to check_for_column…
briri Jun 13, 2022
0f27d3b
added some sleep statements to rspec that try to access suggestions
briri Jun 13, 2022
9a1c42b
added logic to retry suggestion updates for rspec tests of org autoco…
briri Jun 13, 2022
ae8de5d
fixed typos
briri Jun 13, 2022
ff5fef4
another attempt to fix rspec tests with org autocompletes
briri Jun 13, 2022
6c72eaf
another attempt to fix rspec tests with org autocompletes
briri Jun 13, 2022
9da63a5
another attempt to fix rspec tests with org autocompletes
briri Jun 13, 2022
48f3920
another attempt to fix rspec tests with org autocompletes
briri Jun 13, 2022
efa9fc6
Updated Ruby version to 2.7.6
benjaminfaure Jun 14, 2022
46b4fc7
Updated Ruby version in github workflow files
benjaminfaure Jun 14, 2022
66a5d66
Rubocoped some files
benjaminfaure Jun 14, 2022
b4e7c10
tweak ruby version designation in gemfile to just specify major.minor…
briri Jun 14, 2022
2502032
ran bundle install and Version: 2.1.1
briri Jun 14, 2022
d54c68a
discovered issue running specs on mysql. new version of mysqld consid…
briri Jun 14, 2022
20e6b0b
finally fixed autocomplete/typeahead helper for specs
briri Jun 14, 2022
2085e7d
rubocop fixes and fix for index names in migration
briri Jun 14, 2022
343b9d0
fix for outdated db schema
briri Jun 14, 2022
1dcf697
Removed case_sensitivity test on region abbreviation as this field is…
benjaminfaure Jun 15, 2022
6096cf7
removed db migration that added unqiueness indexes
briri Jun 15, 2022
b503726
comment out rspec migration step
briri Jun 15, 2022
158cc5a
updated github actions to use the binstubs
briri Jun 15, 2022
110475e
try bundle exec instead of bin/ in github workflows
briri Jun 15, 2022
538e339
readd case_insensitive check to region
briri Jun 15, 2022
6aa7ca2
updates to tests
briri Jun 15, 2022
b7ace8f
Unpegged mimemagic & pegged font-awesome gem to the major version
benjaminfaure Jun 17, 2022
71965be
Replaced turbolinks (no longer maintained) by turbo-rails
benjaminfaure Jun 17, 2022
310359c
Removed zaru gem and replaced it by built in ActiveStorage::Filename#…
benjaminfaure Jun 17, 2022
ac95461
Commented some unused gems
benjaminfaure Jun 17, 2022
f2c71db
query optomizations based on feedback from Bullet
briri Jun 17, 2022
80b2ac0
attempt to fix randomly failing api v1 deserializer test
briri Jun 17, 2022
aeb683c
Updated ESLint to V8 & replace eslint-loaded by eslint-plugin-import
benjaminfaure Jun 20, 2022
cbbb17b
Removed eslint-action as github has now everything to run ESLint
benjaminfaure Jun 20, 2022
695c66a
Fixed eslint action
benjaminfaure Jun 20, 2022
648c805
Fixed eslint action
benjaminfaure Jun 20, 2022
d6904a5
Removed deprecated option from tinymce config
benjaminfaure Jun 20, 2022
b779346
Upgraded jasmine, jasmine-core & karma-jasmine. Fixed one of the auto…
benjaminfaure Jun 20, 2022
c56bca7
DCC Issue 710: The V0 API calls for assign_users and unassign_users to
Jun 20, 2022
e3a37d4
Upgraded chart.js to V3
benjaminfaure Jun 20, 2022
ed74acb
Upgrade js-cookie to V3
benjaminfaure Jun 20, 2022
b605e02
Merge pull request #3190 from DMPRoadmap/dcc_issue_710_assign_users_t…
briri Jun 24, 2022
bcccaeb
replace deprecated 'resolved_paths' with 'additional_paths' in webpac…
briri Jul 3, 2022
5f0c0c9
Merge branch 'rails_6' of github.com:DMPRoadmap/roadmap into rails_6
briri Jul 3, 2022
d6322ef
bumped dependencies
briri Jul 4, 2022
685cd92
added some config setting for babel to deal with warning messages whe…
briri Jul 5, 2022
94304b9
Merge branch 'development' of github.com:DMPRoadmap/roadmap into deve…
briri Jul 8, 2022
e5d8c32
Merge branch 'development' into rails_6
briri Jul 8, 2022
139d45f
updated rubocop rule
briri Jul 8, 2022
9765df0
make rubocop happy
briri Jul 8, 2022
035931a
Merge pull request #3188 from DMPRoadmap/rails_6
briri Jul 8, 2022
7315c5e
testing codepipeline
briri Jul 14, 2022
40489b8
Merge branch 'development' of github.com:DMPRoadmap/roadmap into deve…
briri Jul 14, 2022
ed51d44
change to REAME for codepipeline demo
briri Jul 19, 2022
bb4003e
update to prevent users from being able to make all of their guidance…
briri Aug 15, 2022
49abe59
Merge branch 'master' into development
briri Aug 15, 2022
0cb89ed
Merge branch 'issue3199' into development
briri Aug 15, 2022
5f10fd1
Merge branch 'master' into development
briri Aug 15, 2022
d1676d8
updates to prevent deletion of only non-optional subset
briri Aug 15, 2022
b26aef6
Merge branch 'issue3199' into development
briri Aug 15, 2022
edebfc8
tweak to logic when editing guidance_group
briri Aug 15, 2022
e24a2cc
Merge branch 'issue3199' into development
briri Aug 15, 2022
2a109b3
tweak to logic when editing guidance_group
briri Aug 15, 2022
646cd54
Merge branch 'issue3199' into development
briri Aug 15, 2022
7acc298
tweak to logic when editing guidance_group
briri Aug 15, 2022
dcad36f
Merge branch 'issue3199' into development
briri Aug 15, 2022
efc89a2
tweak to logic when editing guidance_group
briri Aug 15, 2022
387e7e6
Merge branch 'issue3199' into development
briri Aug 15, 2022
bbf34d0
added @guidance_groups to update and create so they are available dur…
briri Aug 15, 2022
dbbf88d
Merge branch 'issue3199' into development
briri Aug 15, 2022
04e2aca
pluck with ampersand returns not id
nicolasfranck Aug 30, 2022
5eff207
Merge pull request #3209 from nicolasfranck/development
briri Aug 30, 2022
273ce4f
updated Identifier model to strip whitespace before appending Ideenti…
briri Sep 26, 2022
22ab9d4
updated fix to first convert the value to string before trying to str…
briri Sep 28, 2022
f0f03c0
Fix for issue #3217 regarding template search feature
gjacob24 Oct 3, 2022
4b2fe7e
Fixed issue with Plan & Template visibilities
benjaminfaure Oct 24, 2022
426cde5
Update gems & js packages
benjaminfaure Oct 24, 2022
87abe8c
Merge pull request #3218 from DMPRoadmap/template_search_issue_3217
briri Oct 24, 2022
e05460d
Merge pull request #3212 from DMPRoadmap/dmptool-issue379
briri Oct 24, 2022
a989193
commented our Capybara.start
pengyin-shan Oct 24, 2022
72181c7
Merge pull request #3224 from DMPRoadmap/fix_Capybara
briri Oct 24, 2022
bb31d64
Merge branch 'development' into fix/plan_visibility
briri Oct 24, 2022
90d489b
Fixed tests by adding default visibility to template & plan test fact…
benjaminfaure Oct 24, 2022
e57640e
Fixed template tests
benjaminfaure Oct 25, 2022
7cf0dc5
Rubocoped everything
benjaminfaure Oct 25, 2022
e7e7ad6
Translation.io new sync for rails6 25/10/2022
Oct 25, 2022
194c5a6
Merge pull request #3223 from benjaminfaure/fix/plan_visibility
briri Oct 25, 2022
68bf79b
Merge pull request #3227 from DMPRoadmap/translation_io_25_10_22
briri Oct 25, 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
8 changes: 2 additions & 6 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,5 @@ jobs:
- name: 'Yarn Install'
run: yarn install

# Run the ES Lint checks on javascript files
# https://github.com/marketplace/actions/run-eslint
- name: 'ES Lint checks'
uses: stefanoeb/eslint-action@1.0.0
with:
args: './app/javascript/**/*.js'
- name: 'Run ESLint'
run: yarn run eslint app/javascript/**/*.js --ext .js
29 changes: 14 additions & 15 deletions .github/workflows/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
# Install Ruby and run bundler
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6.3
ruby-version: 2.7.6
bundler-cache: true

# Install Node
Expand Down Expand Up @@ -48,28 +48,27 @@ jobs:

# Start the DB server and initialize the DB
- name: 'Start MySQL'
run: sudo systemctl start mysql

- name: 'Build out the test database'
run: |
sudo systemctl start mysql
bin/rails db:setup RAILS_ENV=test
bin/rails db:migrate RAILS_ENV=test
bundle exec rails db:create RAILS_ENV=test
bundle exec rails db:schema:load RAILS_ENV=test

- name: 'Run any pending database migrations'
run: bin/rails db:migrate RAILS_ENV=test

# Prebuild the CSS, JS and image assets
- name: 'Precompile all of the Assets'
run: bin/rails assets:precompile

# briley - comment out Karma tests due to issues with dependencies. We should
# replace these with RSpec feature tests
# Run the JS tests
# - name: 'Run Karma Tests'
# run: yarn test
run: bundle exec rails assets:precompile

# Run the unit and functional tests
- name: 'Run Rspec Unit and Functional Tests'
run: |
bin/bundle exec rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
bin/bundle exec rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
bin/bundle exec rspec spec/mixins/
bundle exec rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
bundle exec rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
bundle exec rspec spec/mixins/

# Run the time consuming integration tests (using Chrome headless browser)
- name: 'Run Rspec Integration Tests'
run: bin/bundle exec rspec spec/features/
run: bundle exec rspec spec/features/
22 changes: 8 additions & 14 deletions .github/workflows/postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
# Install Ruby and run bundler
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6.3
ruby-version: 2.7.6
bundler-cache: true

# Install Node
Expand Down Expand Up @@ -74,26 +74,20 @@ jobs:
# Initialize the DB
- name: 'Setup Test DB'
run: |
bin/rails db:setup RAILS_ENV=test
bin/rails db:migrate RAILS_ENV=test
bundle exec rails db:setup RAILS_ENV=test
bundle exec rails db:migrate RAILS_ENV=test

# Prebuild the CSS, JS and image assets
- name: 'Compile Assets'
run: bin/rails assets:precompile

# briley - comment out Karma tests due to issues with dependencies. We should
# replace these with RSpec feature tests
# Run the JS tests
# - name: 'Run Karma Tests'
# run: yarn test
run: bundle exec rails assets:precompile

# Run the unit and functional tests
- name: 'Run Rspec Unit and Functional Tests'
run: |
bin/rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
bin/rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
bin/rspec spec/mixins/
bundle exec rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
bundle exec rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
bundle exec rspec spec/mixins/

# Run the time consuming integration tests (using Chrome headless browser)
- name: 'Run Integration Tests'
run: bin/rspec spec/features/
run: bundle exec rspec spec/features/
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
# Install Ruby and run bundler
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6.3
ruby-version: 2.7.6
bundler-cache: true

# Run the Rubocop linter checks
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,6 @@ yarn-debug.log*
/yarn-error.log
yarn-debug.log*
.yarn-integrity

# Ignore briley AWS cloud9 script to start the application
cloud9-start.sh
41 changes: 22 additions & 19 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

source 'https://rubygems.org'

ruby '>= 2.6.3'
ruby '>= 2.7'

# ===========#
# CORE RAILS #
# ===========#

# Full-stack web application framework. (http://rubyonrails.org)
gem 'rails', '~> 5.2'
gem 'rails', '~> 6.1'

# TODO: Remove this once Rails addresses the issue with its dependency on mimemagic. Mimemagic had
# an MIT license but was using some incompatible GPL license code.
# Versions of mimemagic that were yanked: https://rubygems.org/gems/mimemagic/versions
# Analysis of the issue: https://www.theregister.com/2021/03/25/ruby_rails_code/
gem 'mimemagic', '~> 0.3.7'
gem 'mimemagic'

# Use sqlite3 as the database for Active Record
# gem 'sqlite3', '~> 1.4'
Expand All @@ -24,13 +24,17 @@ gem 'mimemagic', '~> 0.3.7'
gem 'puma', group: :puma, require: false

# Use SCSS for stylesheets
# TODO : might need to move to cssbundling-rails
# SEE: https://dev.to/kolide/how-to-migrate-a-rails-6-app-from-sass-rails-to-cssbundling-rails-4l41
gem 'sass-rails'

# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem 'webpacker'

# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks'
# Turbo gives you the speed of a single-page web application without having to write any JavaScript..
# Read more: https://github.com/hotwired/turbo-rails
# https://github.com/hotwired/turbo-rails/blob/main/UPGRADING.md
gem 'turbo-rails'

# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder'
Expand Down Expand Up @@ -60,6 +64,7 @@ gem 'bootsnap', require: false

# Rollbar-gem is the SDK for Ruby apps and includes support for apps using
# Rails, Sinatra, Rack, plain Ruby, and other frameworks.
# https://github.com/rollbar/rollbar-gem
gem 'rollbar', group: :rollbar, require: false

# ======== #
Expand Down Expand Up @@ -93,6 +98,7 @@ gem 'devise_invitable'
gem 'omniauth'

# OmniAuth Shibboleth strategies for OmniAuth 1.x
# https://github.com/toyokazu/omniauth-shibboleth
gem 'omniauth-shibboleth'

# ORCID OAuth 2.0 Strategy for OmniAuth 1.0
Expand Down Expand Up @@ -148,6 +154,7 @@ gem 'kaminari'

# Paginate in your headers, not in your response body. This follows the
# proposed RFC-8288 standard for Web linking.
# https://github.com/davidcelis/api-pagination
gem 'api-pagination'

# =========== #
Expand All @@ -158,7 +165,7 @@ gem 'api-pagination'
gem 'sassc-rails'

# Font-Awesome SASS (https://github.com/FortAwesome/font-awesome-sass)
gem 'font-awesome-sass', '~> 5.13.0'
gem 'font-awesome-sass', '~> 5'

# Use webpack to manage app-like JavaScript modules in Rails
# (https://github.com/rails/webpacker)
Expand Down Expand Up @@ -188,10 +195,6 @@ gem 'wicked_pdf'
# (http://github.com/karnov/htmltoword)
gem 'htmltoword'

# Filename sanitization for Ruby. This is useful when you generate filenames for
# downloads from user input
gem 'zaru'

# ==================== #
# INTERNATIONALIZATION #
# ==================== #
Expand Down Expand Up @@ -239,11 +242,11 @@ group :test do
# (https://github.com/thekompanee/fuubar)
gem 'fuubar'

# Guard keeps an eye on your file modifications (http://guardgem.org)
# Guard keeps an eye on your file modifications (https://github.com/guard/guard)
gem 'guard'

# Guard gem for RSpec (https://github.com/guard/guard-rspec)
gem 'guard-rspec'
# gem 'guard-rspec'

# Library for stubbing HTTP requests in Ruby.
# (http://github.com/bblimke/webmock)
Expand Down Expand Up @@ -273,11 +276,11 @@ group :test do

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

# Browser integration tests are expensive. We can mock external requests
# in our tests, but once a browser is involved, we lose control.
gem 'capybara-webmock', '~> 0.6'
gem 'capybara-webmock'

# RSpec::CollectionMatchers lets you express expected outcomes on
# collections of an object in an example.
Expand Down Expand Up @@ -309,22 +312,22 @@ group :ci, :development do
gem 'rubocop-i18n'

# A collection of RuboCop cops to check for performance optimizations in Ruby code.
gem 'rubocop-performance'
# gem 'rubocop-performance'

# Automatic Rails code style checking tool. A RuboCop extension focused on enforcing
# Rails best practices and coding conventions.
gem 'rubocop-rails'
# gem 'rubocop-rails'

# A RuboCop plugin for Rake tasks
gem 'rubocop-rake'
# gem 'rubocop-rake'

# Code style checking for RSpec files. A plugin for the RuboCop code style enforcing
# & linting tool.
gem 'rubocop-rspec'
# gem 'rubocop-rspec'

# Thread-safety checks via static analysis. A plugin for the RuboCop code style
# enforcing & linting tool.
gem 'rubocop-thread_safety'
# gem 'rubocop-thread_safety'
end

group :development do
Expand Down
Loading