Merged DMP OPIDOR V2.3.0

Feedback complete notification now displays the proper user

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

DMP Roadmap V2.1.6 fixes

patch template creation (#2459)

Private plan should not appear in user profile when editing as an org admin

Updating a user as org_admin should no longer display all his plans

Org admin should access plan with administrator visibility or above when editing a user

Merged DMP Roadmap V2.1.5

Org admin can now add a question schema to a question, in model edit

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

Merge pull request #2282 from DMPRoadmap/issue2240 ...

These feature are part of the request for improving the Admin view of

These feature are part of the request for improving the Admin view of ...

users.

Changes:
- on the Editing profile of a user the School or Department dropdown
menu has been made the same horizontal size as other inputs.
- A link has been created on the Users page from Plans (i.e, no. of
plans) to a Plans page for the user.

Fix for #2240.

Added comment on rewritten methods in controllers, models ...

Replaced include by prepend for DMPOPIDoR modules

Merge pull request #2266 from DMPRoadmap/issue2240 ...

Updated functionality for Admin View of Users.

Merge pull request #2268 from DMPRoadmap/issue2147 ...

Fix for the formatting issues with bullet points for exported docx plans

Updated functionality for Admin View of Users. ...

Changes:
 - for Super Admins: Added user department and plans.
 - for Org Admins:
        (1) The user view now has a clickable link for opening up
            a view of a user's profile and plans.
        (2) In a user's profile view the Department if it exists for the
            organisation is editable. The Organisation must have
            departments in systerm to avail of this functionality.

Fix for #2240.

fixed bug with saving template visibility

Merged DMPRoadmap V2.1.3

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

Fix for issue #2088.

Merged DMPRoadmap V2.1.2

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

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

Merge pull request #2151 from DigitalCurationCentre/bug/admin_plans ...

ensure review_plans are active

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 bug with reviewer plans where non-existing id's cause issues

Removed Private plans from org admin csv download

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

Feature/reviewer role

refactored review access from role to permission

capture changes