Merge pull request #2231 from DMPRoadmap/security_sep_19 ...

updated devise, eslint-utils, js-yaml

optimistically fixed faulty annotation spec

added Gemfile.lock

updated devise, eslint-utils, js-yaml

Merge pull request #2216 from DMPRoadmap/bug/customization_transfer ...

fixes an issue where annotations were being added to removed questions

fixes an issue where annotations were being added to removed questions

Security patches (#2209) ...

* update nokogiri to 1.10.4

* updated webpacker-dev-server and js-yml to patch vulnerabilities

fixed js logic to initilize the my_org partial when the org is the other_org (#2208)

Merge pull request #2207 from DigitalCurationCentre/bug/guidance_list ...

fix issue with paginable guidance_controller throwing error when sort…

fix issue with paginable guidance_controller throwing error when sort selected

trying explicit definition of db_services (#2195)

Merge pull request #2152 from DMPRoadmap/development ...

Development -> Master for Release

Merge pull request #2187 from DMPRoadmap/issue/2111 ...

updated plan sharing form according to #2111, also added text to the …

changed tooltip text to use app name from branding

rebased off development, added devise.rb back to gitignore

added gettext markup

updated plan sharing form according to #2111, also added text to the email field to clarify what happens if the user is not in our system

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

Merge pull request #2178 from DMPRoadmap/issue2177 ...

Fixed link for UC3 at footer since the page was previously not found.

Fixed link for UC3 at footer since the page was previously not found.

Merge pull request #2167 from DMPRoadmap/issue2157 ...

Add template version to Plan view.

Merge pull request #2163 from DMPRoadmap/issue2093 ...

Re-introduced the drag feature for the TinyMCE editors.

Add template version to Plan view. ...

Changes added template version to plan overview.

Fix for issue #2157.

Merge pull request #2166 from DMPRoadmap/issue2088 ...

Fix for bugs arising for Super Admins editing Departments of an Orega…

Fix for bugs arising for Super Admins editing Departments of an Oreganisation they did not belong to. ...

Fix for issue #2088.

Fix for issue associated with super-admins and department affiliation in a given organisation. (#2165) ...

Changes made:
  - Department policies now allow both org admins and super admins to
    create update and delete departments, whilst org_admins can only do this
    for their own org. Super admins can do it for any org department.
  - When a super admin switches organisation their department_id is cleared.

Fix for issue #2088.

Re-introduced the drag feature for the TinyMCE editors. ...

Note that we only allow re-sizing vertically. Resizing horizontally would allow the editor to stretch over
other elements in the flow.

Fix for Issue #2093.

Merge pull request #2161 from DMPRoadmap/security_advisories ...

updated dependancies with vulnerabilities

updated dependancies with vulnerabilities

Merge pull request #2155 from DMPRoadmap/issue1743 ...

Fix for humanizing the attribute name for feedback_email_msg in error…