Merged DMPRoadmap V2.1.3

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

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.

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

Feature/reviewer role

updated tests

Datasets integration

updated factories to allow basic specification of template_components

Fixes in models annotations

Fixed models & schema annotations

Added missing files for commit 1d9dde2

Changes following migrations

finished up changes to controllers

refactor plan/role functionality to use flagshihtzu properly

Fix for ensuring that Questions that are option based must have atleast one non-blank text entry. ...

- Validation added for option based questions to ensure text field non-blank.
    - Validation message OPTION_PRESENCE_MESSAGE added to app/models/concerns/validation_messages.rb.
    - Added ':allow_nil => true' to
            delegate :option_based?, to: :question_format, :allow_nil => true
     in Question model to prevent NoMethodError if question_format is nil.

    Fix for #1725

renamed yml examples. added them to bin/setup and added eslint init to travis ...

added eslintrc.json back

moved eslintrc to loaders dir

removed eslint init statement

fixed up eslinter

updated rack and destructured array and object assignments in js. updated release portion of readme

added eslintrc back to gitignore

fixed issue with create plan JS, fixed some warnings in specs

removed console.log statements and updated linter task in travis

Update asset structure with webpacker gem

Fix broken functional tests ...

Fix broken specs with random see 55679

Fix broken tests for random seed 19381

Temporarily disable travis security checks

Since I'm testing the specs, this should help make it faster

Fix bug caused by random Org locale

Fixes recurring issue with tests being loaded in German

Fix broken specs

Fix tests breaking with seed 60029

Fix broken specs with seed 12116

Fix broken specs with seed 51011

Fix broken template upgrades specs

Fix travis artifacts addons

Add Travis asset debugging

Remove Amazon S3 region from asset uploads config

Move S3 configs to local travis file

Re-add hygiene tasks to Travis YML

Disable broken test for now

Refactor tests for template upgrade customisations

Fix broken org factory

Remove old JS form validations (#1867) ...

* added new form validation error handling

added tests for orgs controller

converted over remaining controllers to new errors

enhanced message handlers in application controller

finished form validations

* fixed rubocop for all controllers

* Fix broken specs

- Factories needed to be updated to meet new validation requirements
- Spec was broken since error message had changed

* Fix errors and warnings from npm audit

Refactor how Template upgrade customization works (#1856) ...

* Refactor how Template upgrade customization works

- Added position_in_parent to child-records Phase, Section, and Questions
- Extracted upgrade_customization! into its own service object

wip: rebasing on development

wip: pushing to Ghub

wip: Template upgrade customisation service working

Add migration to update versionable_id for records

* Fix bug in org swaps test

Test was failing because JS wasn't executing fast enough in test browser

* Refactor how locales are set in specs

* Fix bug in plan exports caused by git merge

The routes weren't merged properly which seems to have caused a regression error

* Add documentation for SectionSorter

* Update rubyzip and re-instate Bundle Audit

This was disabled because it was failing the Travis CI script. Since there wasn't a
new version of the rubyzip gem to upgrade to, we couldn't turn the error off.

* Add length constraints to versionable_id

* Add length constraints to versionable_id

* Fix bug in ActsAsSortable module

... I have no idea why those issues haven't popped up before now!?

* Fix random bug in I18n

* Move versioning ID migration into own rake task

rebased onto development ...

stat_created_plan_spec finished

stats table using bigint. StatJoinedUser spec done

csvable_spec done

org_date_rangeable_spec done

Actions::StatCreatedPlan::Generate spec half way done

Actions::StatCreatedPlan::Generate rspec done

Actions::StatJoinedUser::Generate spec finished

Role.with_access_flags instead of access_values_for method

Merge branch 'development' into issue-1844

Extract org swapping into own resource

Fix bug preventing plans from downloading

Refactor how section ordering is handled (#1837) ...

* Extract template customizations into own controller

* Refactor Template model methods

* Fix view logic in draggable sections

* Add button for customising phase

* Fix rubocop violations in GuidanceService

* Rename GuidanceService to GuidancePresenter

* Fix bug in phase preview order sections

* Refactor preview action/controller code

* Fix Section ordering in various views

* Fix rubocop violations

* Fix bug forcing Phases to be modifiable

* Fix broken tests

* Update method to check if section is draggable

* Extract copy action into its own resource

* Extract customization transfers to own controller

* Remove redundant routing condition

* Fix Rubocop violation issues

* Change condition for section draggable

* Refactor instance variable in PlansController

* Fix broken tests

* Add test support for 'de' locale

* Fix merge issue in plans controller

* Fix broken specs in plan#request_feedback

Issue 1845 (#1846) ...

* Fix bug preventing Feedback from being requested

* Fix Rubocop violations

* Extract feedback requests into own controller

* Add test for feedback requests

* Fix Rubocop violations

Add tests for locale setting (#1823) ...

* Add tests for locale setting

- Adds Faker::Language module for testing languages with real-ish data
- Refactors global constants into Language model (See Issue#1696)
- Add specs to test locale change works

* Clean up language files to remove long names

* Add DB check in FastGettext initializer

* Set Memory cache for temporary caching solution

* Fix bug in Plan Rule

Merge pull request #1802 from DMPRoadmap/refactor/database-cleanup ...

Remove redundant database tables and columns

Remove redundant database tables and columns ...

Remove redundant columns and tables listed in #1382

Update models and factories with new schema structure comments.