Update users controller to ensure perm present

Change success message on permission change

Repair broken or pending specs (#1874) ...

- Fix pending Template model specs

- Fix pending model specs

- Fix broken/pending specs, including random "errors" bug

Fixed issues with data_cleanup and section_sorter (#1859) ...

* updated mysql query to update phase/section/question numbering, moved versionable_id rake task, fixed issue with section_sorter

fixed test

* Moved private methods from migrate to upgrade rake

Fix naming format of settings controller

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

Merge pull request #1857 from DigitalCurationCentre/issue1173 ...

Issue 1173

Textual changes made to Plan Edit Details Page: (#1858) ...

* Textual  changes made to Plan Edit Details Page:

- 'Submit' buttons renamed 'Save'
- 'Plan Guidance Configuration' chanded to 'Select Guidance'

* Updated button name in  in failing plans_spec.rb test from
"Submit" to "Save".

Fix broken test in plan exports

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-1843

Merge branch 'development' into issue-1833

Merge branch 'development' into issue-1844

Refactor Answer model

Add specs for PDF download link

Fix bug preventing PDF downloads from dashboard

Fix Rubocop offenses

Fix field alignment in questions form

Refactor sections controller create action

Fix bug when creating first section in phase ...

Would raise an error since no previous section number was available

Refactor Template creation views and controllers

Extract org swapping into own resource

Move template options to main namespace

Fix bug preventing plans from downloading

Refactor plan exports. Extract into own resource

Refactor template options into own controller

Fix sorting in plans controller

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 532 (#1847) ...

* Replaced instances of `raw` with `sanitize`

* Updated Brakeman ignores

* Remove unnecessary sanitation

* Add support for TinyMCE tags