Merged DMPRoadmap V2.1.3

optimistically fixed faulty annotation spec

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

Fix broken plans spec

updated templates_upgrade_customisations_spec to create a question in the created section so the template can validly be published

updated factories to allow basic specification of template_components

capture changes

Fix for randomly failing tests that compare arrays in create_created_plan_service_spec.rb and ...

create_last_month_created_plan_service_spec.rb.

Changes:
 - the array checks now uses the RSpec match_array instead of eq.
 - fixed Rubocop warnings for two files.

Fix for randomly failing test "Org::CreateLastMonthCreatedPlanService.call when no org is passed generates counts by template from today's last month" ...

A array check now ususes the RSpec match_array instead of eq.

Fixes in models annotations

Fixed models & schema annotations

The "No. plans by template" statistics and visualisation changes: ...

(1) The headers for the CSV for the Number of Plans by Template
             - the date column have dates in the format  'Jan 2018'
             - the template headers now display the Title of the templates
             - the Date and Count headers are capitalized.

        (2) The chart has been re-styled.
            The aspect ratio (width/height) of image is now dynamically
            set according to the selection of the month range.

        (3) Fixed broken rspec tests and rubocop errors/warnings.

        Fix for #1679.

Added missing files for commit 1d9dde2

Changes following migrations

updated organisational plans query to only include completed plans to match logic of plan export (#2004) ...

refactored plan.visibility_allowed? to call underlying method on phases

refactored plan.visibility_allowed? to call underlying method on phases

fixed tests

Further changes for Text field should be mandatory for option based questions. ...

Fix for issue #1725

The question_options field on the Customisable Phase template has the
following changes:
- the 'Text' label has the asterick for required.
- the error message for missing question option now reads
 "You must have at least one option with accompanying text."
- Corrected some Rubocop errors on the files added.

finished up changes to controllers

Merge branch 'development' into issue1663