Merge pull request #1869 from DMPRoadmap/bug/settings-controller ...

Fix naming format of settings controller

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

Fix broken test in org swaps

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 pull request #1849 from DMPRoadmap/issue-1843 ...

Fix bug breaking template selection when creating plan

Merge branch 'development' into issue-1843

Merge pull request #1855 from DMPRoadmap/feature/travis-seeds ...

Add seed check to the Travis CI file

Merge pull request #1852 from DMPRoadmap/issue-1833 ...

Fix form alignment on template question creation

Merge branch 'development' into issue-1833

Merge branch 'development' into feature/travis-seeds

Merge pull request #1850 from DMPRoadmap/issue-1844 ...

Fix bug preventing plans from downloading

Merge branch 'development' into issue-1844

Merge pull request #1851 from DMPRoadmap/issue-1835 ...

Fix bug preventing super admin from changing orgs

Refactor how WICKED_PDF_PATH is set in travis

Add wicked PDF load path

A

Add bin/setup to travis seeds job

Fix seed files

Add DB seeds to travis script

Refactor Answer model

Temporarily disable bundle audit from Travis CI

Add wkhtmltopdf to travis script

Add specs for PDF download link

Fix bug preventing PDF downloads from dashboard

Temporarily disabled Bundle-Audit for Travis