Sync Development for Release 2.1.5 - #2397
Merged
Merged
Conversation
fixed typo in plan export
Removed extra div that was causing page layout issues
Updated deep_copy on Plan model to set feedback_requested to false
…t on the user profile
Briri GitHub tests (#2312) * Created Github workflow for tests Github workflow for Rubocop (#2315) * Create ruby.yml * updated to get ruby ver from gem file.lock Update rubocop.yml Update rubocop.yml pulling in our rubocop gem reverted rubocop file Pulled all of the separate gem's rubocop stuff into the repo's rubocop file Removed 'Rails' from rubocop.yml added brakeman workflow fixed bad rubocop disable lines restricted brakeman workflow to PR on master added ES lint workflow fixed typo added workflow for mysql tests chenged workflow names and updated mysql chenged workflow names and updated mysql chenged workflow names and updated mysql chenged workflow names and updated mysql chenged workflow names and updated mysql chenged workflow names and updated mysql added password for mysql tests and fixed spec removed blank line added rails_env environment var added RAILS_ENV to bundle commands removed rails_env from rspec line
* updated gems and yarn dependencies * updated yarn * added csrf gem to deal with omniauth vulnerability * updated dependencies
…ly run against master
GitHub workflows
Update the Travis
added method to reattach labels to their corresponding tinymce iframe
check for agreement to T&Cs was wrong
* removed erroneous div tag * Updated deep_copy on PLan model to set feedback_requested to false * fixed typo in plan export * pegged sprockets
made the user_edit_profile lang field default to DB default language
…sion but have not yet signed-into an account
redirect shibboleth-authed users to sign_in/up page from homepage
* removed erroneous div tag * Updated deep_copy on PLan model to set feedback_requested to false * fixed typo in plan export * refactored usage code to place most of the presentation logic into Rails instead of JS finished up changes to usage fixed eslinter issues fixed rubocop issues fixed additional rubocop issues fixed issue with filter fixed issue with totals removed old controller test and added new usage_controller tests added tests for new usage_helper added usage_policy tests and pundit test helper fixed some rubocop complaints fixed up remaining rubocop issues * removed opens in a new window for usage download buttons and moved org selector to below filters * fixed some rubocop complaints in spec test
Fix a really silly bug with the full-text API
…ervice_spec create_created_plan_service_spec should ignore array ordering
* commented out github workflow for rubocop * commented out github workflow for rubocop
…pellcheck added browser_spellcheck to tinymce
…ok to be in use on any Roadmap instance I could find)
…c_page Remove `#static_pages/roadmap` route
defaulted usage_dashboard to 12 months, reversed selector order
…nd remove the conditional check for the template name in the plan export coversheet
Remove additional validation added to the hash for the funder_name.
…nto OPIDoR-fix/issue2314
…_counts fixed an inconsistency in the template counts for the usage dashboard
Bug/new account language
* bumped rack and tinymce * updated tinymce
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.