add confirmation dialog and fix merge logic

capture status

store new token in a local variable

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.

Fix for humanizing the attribute name for feedback_email_msg in error messages. ...

Updated Org model by overriding the ActiveRecord::Base class method self.human_attribute_name.

Fix for #1743.

Fix for foreign key violation error when a department is deleted ...

after some users have added its department_id.

Solution based on blog "Set Foreign keys to null"
https://til.hashrocket.com/posts/jqilnp3d0h--set-foreign-keys-to-null

Fix for issue #2088

Merge pull request #2149 from DigitalCurationCentre/bug/plan_ownership ...

Bug/plan ownership

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 issue where displayed plan owner was not the creator

rework logic around answer_text for CSV export

fix issue with declaring is_blank?

updated logic so nil answer.text dosent cause errors

updated reviewer to be under can_org_admin? and fixed table of plans to show owner instead of random user (#2140)

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

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

Merge pull request #2127 from DMPRoadmap/issue2090 ...

Allow org admins to view 'share plan' page.

Add typeahead field for Grant ID

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 the missing information in CSV export plans. ...

The answers with question options was not including the answer.text, but overwriting the variable answer_text that held the value.

    Further, we removed line breaks and carriage returns in the answer text and replaced them by spaces making the answer text a single line for the csv.

    Fix for Issue #2058.

fixed pagination issues (#2045) ...

fixed issue with public plans template sort

added check to feedback_requested (#2012)

fixed query (#2008)

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.

made recommended adjustments

removed debug statements

finished up changes to controllers

Merge branch 'development' into issue1663