Fix for ensuring that Questions that are option based must have atleast one non-blank text entry. ...

- Validation added for option based questions to ensure text field non-blank.
    - Validation message OPTION_PRESENCE_MESSAGE added to app/models/concerns/validation_messages.rb.
    - Added ':allow_nil => true' to
            delegate :option_based?, to: :question_format, :allow_nil => true
     in Question model to prevent NoMethodError if question_format is nil.

    Fix for #1725

Fix broken functional tests ...

Fix broken specs with random see 55679

Fix broken tests for random seed 19381

Temporarily disable travis security checks

Since I'm testing the specs, this should help make it faster

Fix bug caused by random Org locale

Fixes recurring issue with tests being loaded in German

Fix broken specs

Fix tests breaking with seed 60029

Fix broken specs with seed 12116

Fix broken specs with seed 51011

Fix broken template upgrades specs

Fix travis artifacts addons

Add Travis asset debugging

Remove Amazon S3 region from asset uploads config

Move S3 configs to local travis file

Re-add hygiene tasks to Travis YML

Disable broken test for now

Refactor tests for template upgrade customisations

Merge pull request #1929 from DMPRoadmap/issue-1853 ...

Fix bug preventing new sections from merging into persisted phases

updated guidance_spec syntax

Fix bug when upgrading Template with new Sections ...

Section presence validation was preventing Question from being saved. This was preventing
new Sections from being saved.

updated guidance spec to allign with validation changes

Started Services and Actions for #1689 (#1871) ...

StatCreatedPlan/StatJoinedUser Services and Action finished. #1689

removed comment. #1689

usage#all endpoint for all usage CSV reports. #1689

usage#all endpoint with request test associated. #1689

Removed require from files

Moved generate actions into services [#1689]

Renamed joined_user service related [#1689]

Renamed stat_created_plan action to service [#1689]

Removed action total_stat in favour of total_count_stat_service

UsageDownloadController using Org::TotalCountStatService instead of the action

Fix broken tests caused by locale configuration (#1875) ...

* Fix broken tests caused by locale configuration

- Add LocaleSet
- Add LocaleFormatter to force proper string formats
- Rename I18n formats to use hyphen
- Add rake task for updating existing languages on DB
- Fix instances of US english in the templates

* Fix FastGettext initializer loader

* Add Amazon S3 creds for Travis

* Revert "Add Amazon S3 creds for Travis"

This reverts commit 366c1a7.

* Fix Faker localization for rake tasks

Was breaking rake db:seed file

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

- Fix pending Template model specs

- Fix pending model specs

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

added validation tests (#1868) ...

added validation tests

added fr for I18n failing tests

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

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

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

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

Added new Rspect tests to org_spec.rb. (#1830)

Configurable plan access (#1828) ...

* added configuration options to branding.yml for plan access, updated links to be dependant on access

* updated spec to expect multiple calls to branding

Reset other_organisation when User org changes ...

- Refactored how user model defines callbacks
- Add specs

Remove specs referencing `sections.published`

Replace deprecated methods with their new alaises

Remove validation spec for UserIdentifier spec ...

This validation was removed from the model

Remove unused validation spec from Theme spec

Remove unused validation spec from Template spec

Removed unused specs from GuidanceGroup specs

Fixed broken User specs

Updated broken Notification specs

Fix broken Guidance specs after merge

Fixed broken Plan specs after model

Merge branch 'development' into refactor/rspec-specs

Update uniqueness validation on GuidanceGroup

Remove uniqueness validation from UserIdentifier