Merged DMP Roadmap V2.1.5

re-wrote the tests on arrays to ignore order

Refactor of usage dashboard (moved logic from JS to Ruby) (#2336) ...

* 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

Org should be active by default

Updated factories & models annotations

removed travis ...

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

Merged DMP Roadmap V2.1.4

Updated deep_copy on PLan model to set feedback_requested to false

The Plans 'Request Feedback' has been relocated from the Share form to a ...

separate form.

Changes:
 - Removed "Request feedback" from the _share_form.html.erb partial and
created a new partial _request_feedback_form.html.erb.
- Added a tab to Plan _navigation.html.erb for 'Request feedback'.

Fix for #2234

Added Stats chart for org template usage

fixed issue with progress bar totals ...

updated logic to allow for phase sepcific progress or total progress

updated plan

Refactored num_answrered_questions

fixed deprecation warnings for Faker ...

updated to use new Webdrivers gem instead of chromedriver. Also added check to prevent redefining VerionableModel

renamed versionable_model

Merged DMPRoadmap V2.1.3

Merge pull request #2232 from DMPRoadmap/master ...

Sync Vulnerability patches from Master -> Development

optimistically fixed faulty annotation spec

empty token is changed to nil when removing_token

fix some discrepancies api token tests

updated gems and yarn dependencies (#2179) ...

* updated gems and yarn dependencies

* updated yarn

* added csrf gem to deal with omniauth vulnerability

* add in explicit disable of non-post omniauth methods, add ignore statement tobundle audit so Travis can run the remaining tests

* replaced depricated Faker::StarWars with new Faker::Movies::StarWars

* downgrading timeago.js to 4.0.0beta.1 from *beta.2

Merged DMPRoadmap V2.1.2

Datasets has been renamed as Research outputs

Add functionality for School/Department for an organisation. ...

Changes:
    - added a Department model whose instances belong to an org and require name.
    - added a DepartmentController and views for create, edit/update and a index view which is a tab
      of 'Organisational Details'.
    - added the optional attribute department_id to User model.
    - added Rspec tests.
    - updated app/controllers/registrations_controller.rb, app/models/org.rb and
      app/models/user.rb to get rid of outstanding Rubocop warnings

    Fix for issue #2088.

fix issues with plan spec (#2142)

Merge pull request #2128 from DMPRoadmap/feature/research-grant-id ...

Add typeahead field for Research Grant ID

Merge pull request #2129 from DigitalCurationCentre/feature/reviewer_role ...

Feature/reviewer role

fix error with test refactor

remove unneeded comments, remove further references to reviewer role from tests, dry up refactored tests

Merge branch 'development' into feature/research-grant-id

updated failing test to create questions in all sections of the template

updated tests

Datasets integration