Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
b52f735
added research outputs to plan
briri Aug 3, 2021
548dbee
added feature test for the new modal search dialog
briri Aug 6, 2021
d584f4f
fixed issues with rubocop and tests
briri Aug 9, 2021
aa7ca94
fix for failing repository model test
briri Aug 9, 2021
bb1f334
made rubocop happy and fixed overwritten funding presenter spec
briri Aug 9, 2021
834fe69
appeasing rubocop
briri Aug 9, 2021
df6e8a2
appeasing rubocop
briri Aug 9, 2021
abbea08
Merge branch 'development' into madmp-research-outputs
briri Aug 18, 2021
3ee100f
Merge branch 'development' into madmp-research-outputs
briri Aug 19, 2021
9519b6d
Merge branch 'development' into madmp-research-outputs
briri Aug 24, 2021
44b661a
Merge branch 'development' of github.com:DMPRoadmap/roadmap into madm…
briri Sep 21, 2021
abb35b7
Merge branch 'madmp-research-outputs' of github.com:DMPRoadmap/roadma…
briri Sep 21, 2021
8d5b954
hopeful fix for randomly failing spec
briri Sep 21, 2021
33b8b1b
Merge branch 'development' into madmp-research-outputs
briri Feb 2, 2022
8a9cd8f
fixed rubocop
briri Feb 2, 2022
2c047b1
Merge branch 'development' into madmp-research-outputs
briri Feb 2, 2022
4aa76f8
revert change to plans factory
briri Feb 2, 2022
e5b4ca0
Merge branch 'development' into madmp-research-outputs
briri Feb 25, 2022
699e724
fix issue with display of org links and email
briri Feb 25, 2022
60c70fa
added @babel.core to JS dependencies
briri Feb 25, 2022
99ab653
commented out karma tests
briri Feb 25, 2022
ea91d53
ran yarn install
briri Feb 25, 2022
4ef7b22
DCC bug 697 - Fix for a roadmap-wide bug where the following were
Mar 3, 2022
05e6c1d
Temporarily commented Karma tests as per https://github.com/DMPRoadma…
Mar 3, 2022
8812ec1
Merge pull request #3119 from DMPRoadmap/dcc_bug_697_api_v1_contact_d…
briri Mar 3, 2022
69492e5
Merge branch 'development' into fix-branding-emails-links
briri Mar 3, 2022
30fa844
Merge pull request #3117 from DMPRoadmap/fix-branding-emails-links
briri Mar 3, 2022
3065ea4
Merge branch 'development' into madmp-research-outputs
briri Mar 3, 2022
cb52da1
Issue #2983 - Removed wrongly displayed required * for name and email
Mar 4, 2022
049500f
Merge pull request #3120 from DMPRoadmap/bug_2983_contributor_page_sh…
raycarrick-ed Mar 4, 2022
2392cf8
link to active role to deactivate. See issue 3121
nicolasfranck Mar 7, 2022
e466fb4
missed some other stuff
nicolasfranck Mar 7, 2022
6b11cac
Merge branch 'development' into madmp-research-outputs
briri Mar 7, 2022
bb5941e
Added toggleable guidance/comments section
benjaminfaure Mar 8, 2022
1c2b042
Changed comments section config variable name
benjaminfaure Mar 9, 2022
8e95a5b
Changed fontawesome chevron icon
benjaminfaure Mar 9, 2022
21797d1
translation sync 2022-03-10
raycarrick-ed Mar 10, 2022
8bf1642
Merge pull request #3125 from DMPRoadmap/translation_sync_20220310
briri Mar 10, 2022
b0fa95a
Merge branch 'development' into fix_issue_3121
briri Mar 10, 2022
7f8cc03
DCC Issue 706 - REST API V1 /api/v1/plans is returning publicly visible
Mar 10, 2022
5faa496
Merge branch 'development' into dcc_bug_706_plans__via_api_v1_returni…
johnpinto1 Mar 10, 2022
e2bd97b
Merge pull request #3124 from DMPRoadmap/dcc_bug_706_plans__via_api_v…
briri Mar 10, 2022
a91de7b
Merge branch 'development' into fix_issue_3121
raycarrick-ed Mar 11, 2022
832eae0
Merge pull request #3123 from OPIDoR/feature/toggeable_comments_section
briri Mar 11, 2022
fefe46b
Merge branch 'development' into madmp-research-outputs
briri Mar 11, 2022
2359263
filter roles
nicolasfranck Mar 14, 2022
835cb9a
revert string format token change made during rubocop upgrade
briri Mar 14, 2022
634dc27
updated rubocop rule
briri Mar 14, 2022
0759291
Merge pull request #3128 from DMPRoadmap/revert-string-format-tokens
raycarrick-ed Mar 15, 2022
5bb265f
trans sync after string variable interpretation change
raycarrick-ed Mar 15, 2022
1d63351
Merge pull request #3129 from DMPRoadmap/trans_sync_20220315
briri Mar 15, 2022
13fe10b
fix issue 3038
nicolasfranck Mar 15, 2022
a740f15
DCC BUG 713 - Fix for Org Admins cannot share Plans.
Mar 17, 2022
f1a82d0
DCC BUG #710 - Fix for "Error using unassign_users from a Department …
Mar 17, 2022
379f70d
add validation to new madmp models
nicolasfranck Mar 29, 2022
c832e18
DCC Bug 711 - Fix for broken creation of a Plan using the V0 API.
Mar 28, 2022
58c23e9
DCC bug 711 - Fix for the Rest API call POST /api/v1/plans for Plan
Mar 31, 2022
030831f
Merge pull request #3137 from DMPRoadmap/dcc_bug_711-Creating_plans_u…
briri Mar 31, 2022
ac081f6
Merge branch 'development' into dcc_bug_711-Creating_plans_using_V0_R…
briri Mar 31, 2022
c9f7af5
Merge branch 'development' into dcc_bug_710-Error_using_unassign_user…
briri Mar 31, 2022
9883fcd
fix for broken test
briri Mar 31, 2022
9302d3d
appease rubocop
briri Mar 31, 2022
3e2e2e7
Merge pull request #3135 from DMPRoadmap/dcc_bug_711-Creating_plans_u…
briri Mar 31, 2022
f08aeb6
Merge branch 'development' into dcc_bug_710-Error_using_unassign_user…
briri Mar 31, 2022
d482e17
Merge pull request #3132 from DMPRoadmap/dcc_bug_710-Error_using_unas…
briri Mar 31, 2022
c68189f
Merge branch 'development' into bug_dcc_713_admins_don_have_access_to…
briri Mar 31, 2022
705c94d
Merge pull request #3131 from DMPRoadmap/bug_dcc_713_admins_don_have_…
briri Mar 31, 2022
559d56b
Merge branch 'development' into fix_issue_3126
briri Mar 31, 2022
51e00e5
Merge pull request #3127 from nicolasfranck/fix_issue_3126
briri Mar 31, 2022
e7ed86d
Merge branch 'development' into fix_issue_3121
briri Mar 31, 2022
ae12f0c
Merge pull request #3122 from nicolasfranck/fix_issue_3121
briri Mar 31, 2022
4a7c695
Merge branch 'development' into fix_issue_3038
briri Mar 31, 2022
3c2cf70
Update questions_controller.rb
briri Mar 31, 2022
235624d
Merge pull request #3130 from nicolasfranck/fix_issue_3038
briri Mar 31, 2022
36fc51b
Merge branch 'development' into madmp-research-outputs
briri Mar 31, 2022
a7a2d83
added node_modules to ignored source paths for translation.io ... sho…
briri Mar 31, 2022
6b18c4c
Merge branch 'madmp-research-outputs' of github.com:DMPRoadmap/roadma…
briri Mar 31, 2022
306a608
fixed typo in test
briri Mar 31, 2022
661a952
Merge branch 'madmp-research-outputs' into madmp-research-outputs_val…
briri Mar 31, 2022
8015bb1
fixed rubocop complaints
briri Mar 31, 2022
3bc7561
Merge branch 'nicolasfranck-madmp-research-outputs_validation' into m…
briri Mar 31, 2022
74076b2
updated rspec test for re3data service to use controlled list of term…
briri Apr 5, 2022
69855dc
switch 'min_height' to 'autoresize_min_height' for tinymce
briri Apr 5, 2022
c8ca7a0
add ignore for ruby version EOL in Brakeman
briri Apr 5, 2022
c02a120
Merge branch 'development' into tinymce-size-fix
briri Apr 5, 2022
f7ef1f4
Merge branch 'development' into madmp-research-outputs
briri Apr 5, 2022
ffe7150
updated gem dependencies, pegged bootstrap-sass at 3.4.1 due to an is…
briri Apr 5, 2022
9a68a19
proposal to avoid used unpublished templates
nicolasfranck Apr 5, 2022
7eae937
DCC Feature #345 - Allow Orgs to set a different Help Desk Email Ad…
Apr 6, 2022
a8e1b8a
Merge pull request #3141 from DMPRoadmap/tinymce-size-fix
raycarrick-ed Apr 6, 2022
e93dbb9
Merge branch 'development' into madmp-research-outputs
raycarrick-ed Apr 6, 2022
90520ff
Merge branch 'development' into dcc_bug_345_customising_helpdesk_emai…
briri Apr 6, 2022
935d3de
Update schema.rb
briri Apr 6, 2022
f1110b1
Merge pull request #2992 from DMPRoadmap/madmp-research-outputs
briri Apr 6, 2022
b4ce5dc
Merge branch 'development' into dcc_bug_345_customising_helpdesk_emai…
briri Apr 6, 2022
6648c56
fixed deprecation warning for Pundit
briri Apr 6, 2022
688a768
reran bundler and yarn updates
briri Apr 6, 2022
5f5c8bc
Merge branch 'development' into dependency-updates
briri Apr 6, 2022
b175831
rebuilt gemfile without platform specific info
briri Apr 6, 2022
6445448
fixed issue with capybara-webmock reverting to v 0.1
briri Apr 6, 2022
58a7a59
Merge pull request #3142 from DMPRoadmap/dependency-updates
briri Apr 6, 2022
9d47104
Merge branch 'development' into dcc_bug_345_customising_helpdesk_emai…
briri Apr 6, 2022
8ca9b70
switched helper to use named args and have a default
briri Apr 6, 2022
20a2ea7
fixed typo
briri Apr 6, 2022
04ae2c5
tweak to email_signature to reduce confusion over helpdesk_email var …
briri Apr 6, 2022
f3836fe
updated mailer to use named arg for helpdesk_emai
briri Apr 6, 2022
347365d
Merge pull request #3140 from DMPRoadmap/dcc_bug_345_customising_help…
briri Apr 6, 2022
c3b9e8e
Merge branch 'development' into fix_unpublish_template
briri Apr 6, 2022
acd8db8
turned madmp features on
briri Apr 6, 2022
b5751eb
Merge branch 'development' of github.com:DMPRoadmap/roadmap into deve…
briri Apr 6, 2022
14c208a
minor fixes for madmp researcch_outputs functionality
briri Apr 6, 2022
1d4f5b7
Merge branch 'development' into fix_unpublish_template
briri Apr 6, 2022
ce5e0cf
updated translations for v3.0.7
raycarrick-ed Apr 7, 2022
958cb10
make rubocop happy
nicolasfranck Apr 7, 2022
2dd408e
Merge branch 'fix_unpublish_template' of github.com:nicolasfranck/roa…
nicolasfranck Apr 7, 2022
2335f89
Merge pull request #3147 from DMPRoadmap/translations_april_2022
briri Apr 7, 2022
dbc9e2f
Merge branch 'development' into fix_unpublish_template
briri Apr 7, 2022
4eef78d
Merge pull request #3143 from nicolasfranck/fix_unpublish_template
briri Apr 7, 2022
bf05372
Merge branch 'master' into development
briri Apr 7, 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
6 changes: 4 additions & 2 deletions .github/workflows/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,11 @@ jobs:
- 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
# - name: 'Run Karma Tests'
# run: yarn test

# Run the unit and functional tests
- name: 'Run Rspec Unit and Functional Tests'
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,11 @@ jobs:
- 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
# - name: 'Run Karma Tests'
# run: yarn test

# Run the unit and functional tests
- name: 'Run Rspec Unit and Functional Tests'
Expand Down
5 changes: 5 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@ Style/DocumentDynamicEvalDefinition: # new in 1.1
Enabled: true
Style/EndlessMethod: # new in 1.8
Enabled: true
Style/FormatStringToken:
# Force use of the `%{variable}` style of tokens instead of `%<variable>s` because
# Translation.io has trouble with auto-translating it. It converts `%<variable>s` to
# `%<variable> s` (note the added space)
EnforcedStyle: template
Style/HashConversion: # new in 1.10
Enabled: true
Style/HashExcept: # new in 1.7
Expand Down
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ gem 'httparty'
# Autoload dotenv in Rails. (https://github.com/bkeepers/dotenv)
gem 'dotenv-rails'

gem 'activerecord_json_validator'

# ================================= #
# ENVIRONMENT SPECIFIC DEPENDENCIES #
# ================================= #
Expand Down Expand Up @@ -275,7 +277,7 @@ group :test do

# 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'
gem 'capybara-webmock', '~> 0.6'

# RSpec::CollectionMatchers lets you express expected outcomes on
# collections of an object in an example.
Expand Down
Loading