Remove additional validation added to the hash for the funder_name. And remove the conditional check for the template name in the plan export coversheet

rework logic around answer_text for CSV export

fix issue with declaring is_blank?

updated logic so nil answer.text dosent cause errors

Complete merge Development -> Master

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.

Merge branch 'master' into development

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.

Updated JS for requiredField to allow for dynamically loaded DOM elements (#1996) ...

* IssueID #1725 - Updated messages Question text and option presence messages.

* updated requiredField.js to allow for dynamically loaded DOM elements

* fixed broken tests

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

fixed issue with args in translatable:find (#1963) ...

fixed issue with translatable text having a newline between the closing quote and the closing paren

fixed issues with translatable text in planscsv export and sharing notification

fixed issue with translatable on templates controller

fixed issue with multiline strings in translatable:find

fixed issue with multiline strings in translatable:find

cleaned up en-US translations

Fix for broken exportable plans csv download (#1730) ...

* Csv export of plan:
  - When plan empty and 'question text and section heading' checked,
    then questions and headings shown. If 'unanswered question' checked,
    then 'Not Answered' now added to Answer column.
  - Answers with options now displayed (previously appeared empty).
  - If 'supplementary section(s) not requested by funding organisation' checked,    then  the section is now displayed.

* Also changed code in exportable_plan.rb to pass Rubocop requirements.

updated section/question export logic in helper (#1888)

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

Fix bug preventing plans from downloading

Exported Plan bug and style fixes: ...

- The csv export now shows the project coversheet text when the option is selected.
- the text export now shows the questions when question text option selected.

Fix for "Plan Download". ...

This is a clean up of code based on PR comments.

Also updated the ExportablePlan helper method as_csv() to work with the selections made on the Plan Download page.

Issue #1730

Fix for "Plan download file not filtering on selection on Download page". ...

Issue #1730

Also included is a fix for rendering if saving a new plan or editing a plan that results in
errors.

Refactored model code for better readability

Add extra validations for all models ...

- Includes specs using the Shoulda gem
- Includes a refactoring of update_numbers to a "sortable" abstraction

Merge pull request #1753 from DMPRoadmap/bug/git-merge-conficts ...

Remove git merge conflict message in template