Merge branch 'develop' into main

.env.test

@@ -14,6 +14,6 @@ CONTENTFUL_URL=cdn.contentful.com
 CONTENTFUL_SPACE=test
 CONTENTFUL_ENVIRONMENT=master
 CONTENTFUL_ACCESS_TOKEN=123
-CONTENTFUL_PLANNING_START_ENTRY_ID=1UjQurSOi5MWkcRuGxdXZS
+CONTENTFUL_PLANNING_START_ENTRY_ID=contentful-starting-step
 CONTENTFUL_PREVIEW_APP=false
 CONTENTFUL_ENTRY_CACHING=false

CHANGELOG.md

@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog 1.0.0].
 
 ## [Unreleased]
 
+## [release-005] - 2021-1-19
+
+- users can see an initial slice of their specification as HTML at the end of their journey
+- users can download their specification as a document in the .docx format
+- checkbox answers are editable
+- radio and select questions are created with the new `ExtendedOptions` field
+- questions are now all loaded at the start of a journey, rather than step by step
+- users start the journey at the task list instead of the first question
+- check your answers pattern has been replaced by a task list
+- radio questions can be configured to ask the user for additional text
+- update the service name to the latest decision
+
 ## [release-004] - 2020-12-17
 
 - fix primary key type on long_text_answers table to UUID
@@ -51,7 +63,8 @@ Contentful fixture
 - Contentful can redirect users to preview endpoints
 - users can be asked to answer a long text question
 
-[unreleased]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-004...HEAD
+[unreleased]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-005...HEAD
+[release-005]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-004...release-005
 [release-004]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-003...release-004
 [release-003]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-002...release-003
 [release-002]: https://github.com/DFE-Digital/buy-for-your-school/compare/release-001...release-002

Gemfile

@@ -10,15 +10,17 @@ gem "coffee-rails", "~> 5.0"
 gem "contentful", "~> 2.15"
 gem "govuk_design_system_formbuilder", "~> 2.1"
 gem "high_voltage"
+gem "htmltoword"
 gem "jbuilder", "~> 2.5"
 gem "jquery-rails"
+gem "liquid"
 gem "pg"
 gem "mini_racer"
 gem "puma", "~> 5.1"
 gem "redis", "~> 4.2"
 gem "redis-namespace"
 gem "rollbar"
-gem "rails", "~> 6.1.0"
+gem "rails", "~> 6.1.1"
 gem "sass-rails", "~> 6.0"
 gem "sidekiq", "~> 6.1"
 gem "sidekiq-cron", "~> 1.2"
@@ -27,7 +29,7 @@ gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
 gem "uglifier", ">= 1.3.0"
 
 group :development do
-  gem "listen", ">= 3.0.5", "< 3.4"
+  gem "listen", ">= 3.0.5", "< 3.5"
   gem "spring"
   gem "spring-watcher-listen", "~> 2.0.0"
   gem "web-console", ">= 3.3.0"