Skip to content

v30973-stable: Merge pull request #1192 from DFE-Digital/development

Pre-release
Pre-release

Choose a tag to compare

released this 20 Nov 08:48
970b504

Changes:

  • 970b504 Merge pull request #1192 from DFE-Digital/development
  • fdb56ff Merge pull request #1191 from DFE-Digital/SE-1727/show-cancellation-reason-on-placement_request-show
  • 80bf7f4 Merge pull request #1173 from DFE-Digital/dependabot/bundler/json-jwt-1.11.0
  • 15d9f56 Merge pull request #1176 from DFE-Digital/feature/1463/maintain-formatting
  • 0ad2bcb Merge pull request #1178 from DFE-Digital/device-switching
  • 4ba5182 Merge pull request #1188 from DFE-Digital/SE-1936/fix-key-error-confirm-attendance
  • 32ce8d9 use slice
  • f45edfb Merge pull request #1186 from DFE-Digital/SE-1979/confirm-booking-validation-text
  • 3c96bb9 Add bread crumbs to placement_requests show
  • d9df2af Share partial with withdrawn_requests/show
See More
  • ec86361 Add extra details to cancellation partial
  • e435f90 Merge pull request #1187 from DFE-Digital/SE-1965/reposition-disability-confident-logo
  • 3260cd5 Moved safe_format to its own helper module
  • 1f00db4 Raise if we end up with a blank key
  • c94f686 Merge pull request #1177 from DFE-Digital/feature/1955/handle-unset-env-vars
  • ac35e9e Merge pull request #1189 from DFE-Digital/SE-1994/remove-duplicates-before-sending-emails
  • c68a170 Merge pull request #1190 from DFE-Digital/dependabot/bundler/master/autoprefixer-rails-9.7.2
  • a4904ab Display cancellation on placement request show.
  • 2c592d4 Bump autoprefixer-rails from 9.7.1 to 9.7.2
  • 778b9a9 Remove duplicates before sending emails
  • db9ea24 Merge pull request #1185 from DFE-Digital/feature/use-development-branch-for-image-cache
  • 4e6c6c6 Ensure the params match the bookings
  • d2ad2a4 Reposition access needs details to match prototype
  • 2b295d3 Add missing validation text
  • b0fcae4 Merge pull request #1184 from DFE-Digital/SE-1967/display-degree-stage-explanation
  • d2f6adb Use development branch images for docker cache
  • 505dff6 Merge pull request #982 from DFE-Digital/refactor/use-active-model-attribute-defaults
  • 2fda572 Display degree_stage_explaination (sic)
  • 8a080d2 Merge pull request #1181 from DFE-Digital/bugfix/stop-defaulting-to-secondary-se-1981
  • 11e958c Remove unnecessary on clause from validation
  • c29df77 Rename phase checking methods to make clearer
  • 6855723 Merge pull request #1168 from DFE-Digital/fix-typo
  • f2c3c72 Merge pull request #1182 from DFE-Digital/bugfix/add-validation-message-for-missing-duration
  • 4655983 Merge pull request #1183 from DFE-Digital/bugfix/1986/incorrect-flow-after-date-change
  • 2559469 Fixed editing SubjectAndDateInformtation
  • 27732f0 Add missing duration validation message when blank
  • f1aad50 Handle legacy verification emails
  • 85e8d74 Improve supports_subjects validation
  • 7595f62 Merge pull request #1180 from DFE-Digital/bugfix/add-subject-editing-to-placement-dates-se-1985
  • 8fc47a7 Ensure chosen subjects are checked when editing
  • f229bc4 Set subject_ids when initialising the object
  • d521279 Fixes device switching for subject specific dates
  • 436c78f Dont error if DFE SIGN IN env vars are not set
  • 79d6f10 Rename @registration_session data
  • 912aa0f Replaced prior uses of simple_format with safe_format
  • 48ebfed Use safe_format helper when showing content from any textarea field
  • 1d1f8f8 Merge pull request #1174 from DFE-Digital/feature/prevent-placement-date-config-if-empty-se-1989
  • 8d1dff6 Merge pull request #1172 from DFE-Digital/dependabot/bundler/master/json-jwt-1.11.0
  • 11a1b7c Merge pull request #1170 from DFE-Digital/feature/improve-placement-date-start-date-validation-se-1969
  • fc3a20d Merge pull request #1169 from DFE-Digital/feature/improve-date-of-birth-validation-se-1966
  • 39b8652 Bump json-jwt from 1.10.2 to 1.11.0
  • 582644d [Security] Bump json-jwt from 1.10.2 to 1.11.0
  • f15bb82 Skip configuration for primary dates
  • 7192392 Merge pull request #1171 from DFE-Digital/enable-subject-specific-dates
  • 5edd0ba Merge pull request #1167 from DFE-Digital/feature/1934/deletion-strategy
  • a8a287c enable subject_specific_dates
  • 4e3f569 Improve placement date missing date validation
  • 68dbc73 Improve the validation messages for date of birth
  • 7e43b09 Fix typo'd label
  • 76e689c Merge pull request #1166 from DFE-Digital/dependabot/bundler/master/sentry-raven-2.12.3
  • 7f25cd0 Working deletion strategy for schools dashboard as well
  • c81ad0d Working deletion strategy for Candidates screens
  • ec2dc4c Prevent DatabaseCleaner from trying to disable referential integrity
  • 22c2d81 Switch to using deletion strategy
  • ae6bc4a Bump sentry-raven from 2.12.2 to 2.12.3
  • c843f23 Merge pull request #1163 from DFE-Digital/development
  • 37e8484 Added safe_format for formatting text but stripping out markup
  • ca7ddd8 Merge pull request #1161 from DFE-Digital/feature/rejig-candidate-landing-page-se-1835
  • abed569 Merge pull request #1162 from DFE-Digital/feature/reword-select-experience-type
  • 719cfb9 Merge pull request #1160 from DFE-Digital/bugfix/1951/handle-credentials-in-url
  • 5b0cb71 Merge pull request #1159 from DFE-Digital/feature/fix-building-debug-branch
  • fd7b665 Merge pull request #1068 from DFE-Digital/feature/log-accordion-interaction-se-1220
  • 5ed91d8 Try rewording the experience type radio buttons
  • 03d8e25 Named variable more appropriately
  • 2d37d7a Merge pull request #1131 from DFE-Digital/feature/offer-school-change-when-navigating-to-placement-request-se-1878
  • 9139dac Add manage schools link to candidates home page
  • 5d3df3d Merge pull request #1155 from DFE-Digital/feature/make-date-validation-messages-specific
  • 56ef429 Merge pull request #1069 from DFE-Digital/feature/subject-specific-dates-se-1804
  • f5d3ce7 Move validation messages to locales
  • 0e7abb0 Fix matching urls with credentials in
  • 72e1942 Merge pull request #1158 from DFE-Digital/dependabot/npm_and_yarn/master/core-js-3.4.1
  • 7c12f52 Bump core-js from 3.4.0 to 3.4.1
  • 9d9cac1 Further attempts to get debug branch to run in CD
  • 7ab4f27 Push debug images to DockerHub for testing in CD
  • 5b47bf1 Merge pull request #1145 from DFE-Digital/SE-1841/bookings/validate-not-cancelled-when-setting-attended
  • 9712693 Merge pull request #1153 from DFE-Digital/SE-1752/remove-pii-from-rejection-email
  • 26a463e Merge pull request #1154 from DFE-Digital/SE-1771/fix-layout-revised-booking-date
  • b7b728a Merge pull request #1156 from DFE-Digital/development
  • 28dc598 Make validates_timeliness messages specific
  • 65ba86c Merge branch 'master' into development
  • 114ebd3 Merge pull request #1152 from DFE-Digital/feature/1942/reduce-school-name-in-gitis-log
  • d60820d Sync template with notify
  • bf1d29b Merge pull request #1059 from DFE-Digital/feature/1673/retry-GETs-to-gitis
  • f2989f3 Remove candidate name from Rejection emails
  • 7052792 Merge pull request #1149 from DFE-Digital/feature/subject-specific-dates-add-missing-step-definitions-se-1804-14
  • 4160b04 Merge pull request #1151 from DFE-Digital/feature/change-dob-error-to-provide-valid-example-se-1940
  • f33fca5 Merge branch 'development' into feature/subject-specific-dates-se-1804
  • 5968ad3 Truncate the length of school names
  • 72104cd Remove migration that is subsequently reverted
  • 987f6db Change the example birth date from 2007 to 1997
  • f37a23e Merge pull request #1124 from DFE-Digital/feature/add-pagination-to-placement-requests-page
  • b7ab9b8 Merge pull request #1142 from DFE-Digital/dependabot/bundler/master/notifications-ruby-client-5.1.0
  • 6e5c79b Merge pull request #1141 from DFE-Digital/dependabot/bundler/master/puma-4.3.0
  • 967cff5 Merge pull request #1146 from DFE-Digital/feature/updating-subject-specific-date-copy-se-1915
  • c221cda Merge pull request #1144 from DFE-Digital/SE-1571/add-link-to-feedback-survey
  • 34773e1 Merge pull request #1148 from DFE-Digital/SE-1757/school-profile-update-experience-detail-copy
  • 583fc36 Merge pull request #1147 from DFE-Digital/SE-1885/add-photo-id-to-candidate-requirements
  • 73f5c98 Merge pull request #1143 from DFE-Digital/feature/update-candidate-request-rejection-template-se-1460
  • 26e0447 Add step defs for subject specific date scenarios
  • ec122e4 Updates copy to match prototype
  • ca39bf5 Add photo id candidate requirement
  • 29c1338 Merge pull request #1058 from DFE-Digital/SE-1667/remove-candidate-requirement-feature-flags
  • 97c3aaa Update copy on subject selection screen
  • 2f6a524 Merge branch 'development' into SE-1667/remove-candidate-requirement-feature-flags
  • 06c496b Update placement date config screen copy
  • d032de6 Update placement date copy so it matches design
  • 059ce14 Change 'Add dates' to 'Add a date'
  • a07eb70 Add informative paragraph to subject/date form
  • 09bf7f9 Validate booking not cancelled on setting attended
  • 1d6f371 Fixt language, remove 'placement' and 'upcoming'
  • 860f10f Add feedback links to placement_request emails
  • 55e33a6 Merge pull request #1138 from DFE-Digital/feature/fix-no-availability-warning-link-se-1833
  • 96ec2ec Sync template to reflect updated notify email
  • 2989270 Merge pull request #1140 from DFE-Digital/bugfix/several-small-spelling-fixes
  • 79e9be3 Bump notifications-ruby-client from 4.0.0 to 5.1.0
  • 77b67fc Bump puma from 4.2.1 to 4.3.0
  • 8391e4f Merge pull request #983 from DFE-Digital/feature/reset-change-tracking-after-successful-write
  • bb67a36 Merge pull request #984 from DFE-Digital/feature/freeze-entity-attribute-assignment
  • 19d620a Merge pull request #981 from DFE-Digital/refactor/use-active-model-attributes
  • 45cae33 Merge pull request #1136 from DFE-Digital/dependabot/npm_and_yarn/master/core-js-3.4.0
  • 35ecda2 Remove 'manage' from form description
  • fa2e821 Change the to they to improve readability
  • 3e7ce5e Add missing word so error sentence makes sense
  • 2464a03 Upgrade form builder to fix serialisation bug
  • d926fc8 Fix n+1 query creating grouped secondary dates
  • b3f0a78 Change the warning link to point to avail prefs
  • bbb5ab4 Merge pull request #1137 from DFE-Digital/bugfix/dbs-policy
  • 4981108 Fix publishing profile for schools w/o dbs
  • 77b6e35 Remove the word 'placement' from title
  • d480eba Merge pull request #1134 from DFE-Digital/bugfix/fix-disabilities-typo
  • 6be091c Merge pull request #1133 from DFE-Digital/bugfix/fix-understand-typo
  • 82d3100 Bump core-js from 3.3.6 to 3.4.0
  • cd2c36e Change 'your' to 'you' to make sentence make sense
  • 286e09a Fix spelling of disabilities
  • 44f5560 Add the missing 'r' to understand
  • 83af4f7 Merge pull request #1126 from DFE-Digital/feature/dont-trigger-exceptions-for-session-expiry-se-1857
  • e5d5803 Merge pull request #1119 from DFE-Digital/dependabot/bundler/master/cucumber-rails-2.0.0
  • 60b2875 Make urn a required arg when raising wrong school
  • 1bcd761 Make SwitchController inherit from ApplicationController
  • 2780274 Allow view to show page with no URN
  • f2f3bae Add specs for show action of switch controller
  • a9a5859 Merge pull request #1052 from DFE-Digital/feature/1806/rejected-requests-page
  • 3abd660 Merge pull request #1127 from DFE-Digital/feature/raise-bullet-errors-in-development
  • 030d3f5 Merge pull request #1130 from DFE-Digital/development
  • 3c96094 Merge pull request #1128 from DFE-Digital/feature/1804/use-subject-id-instead-of-placement-date-subject-id
  • b0fc3d5 Add school switch redirection when pr not found
  • b002217 removed dead code
  • 358a3e4 Add show template for switch and add route
  • de581fe Make bullet raise errors in development
  • 4d1fb4d Validate the placement_date_subject actually exists
  • 379dc65 Minor refactor of specs for validation of subject_and_date_information
  • 521c3e5 Renamed misleading method subject_and_date_ids to date_and_subject_ids
  • d11d2fe Renamed combined_id to date_and_subject_id
  • a3af946 Changed definition of combined_id to be combination of date and subject
  • d059d17 Merge pull request #1081 from DFE-Digital/SE-1893/fix_candidate_subject_list
  • 203b202 Merge pull request #1118 from DFE-Digital/dependabot/bundler/master/autoprefixer-rails-9.7.1
  • 3641abd Merge pull request #1121 from DFE-Digital/dependabot/npm_and_yarn/master/core-js-3.3.6
  • eed6998 Merge pull request #1125 from DFE-Digital/dependabot/bundler/master/phonelib-0.6.39
  • 7507729 Corrected publicly visible name for Placement Requests
  • 21e3072 Bump phonelib from 0.6.38 to 0.6.39
  • 30ad6e9 Added pagination to Placement Requests listing in Schools dashboard
  • 6b6d9b6 Merge pull request #1122 from DFE-Digital/feature/record-feedback-referrers-se-1774
  • bc35a8a Stop raising errors for session expiry
  • c6e5cbb Remove migration
  • becf86a Remove migration that removes column
  • 9d2bc21 Merge pull request #979 from DFE-Digital/feature/prevent-blank-flexible-date-submissions-se-1754
  • e7e286e Merge pull request #1123 from DFE-Digital/subject-specific-dates-fix-migration
  • e3060b4 Add features covering recording the referrer
  • 4d39095 Fix migration
  • e4bcea1 Add and set referrer hidden field to feedback form
  • 665d366 Add referrer attribute to feedbacks model
  • bf28e0e Merge pull request #1111 from DFE-Digital/feature/1876/handle-host-name-endinging-in-dot
  • 36a05c8 Bump core-js from 3.3.5 to 3.3.6
  • b888234 Bump cucumber-rails from 1.8.0 to 2.0.0
  • 460ba33 Bump autoprefixer-rails from 9.7.0 to 9.7.1
  • 2f44aee removed spurious comment
  • 72672f9 Merge pull request #1117 from DFE-Digital/se-1804-dedup-presenting-dates
  • bbc32f5 Merge pull request #1115 from DFE-Digital/feature/subject-specific-dates-ui-tweaks-se-1804-13
  • 3fc6f21 Add scopes for primary and secondary dates
  • 62fa3ec Dedup date presenting logic
  • f2aa2af Moved complicated conditions for validations into their own methods
  • 1c67c87 Move back link to the top, make page full width
  • 7a14274 Prevent placement dates date from wrapping
  • e06787b Add date to placement_date_option
  • da02202 Make the dates management index full width
  • 15d5c98 Merge pull request #1109 from DFE-Digital/update-subject-specifc-dates-controller-to-match-others
  • a3af167 Merge pull request #1114 from DFE-Digital/feature/subject-specific-dates-improve-placement-date-queries-se-1804-12
  • 563c823 Ensure primary and secondary dates are .available
  • a76e46a Change requested_subject to return a subject
  • 28b41f7 Merge pull request #1112 from DFE-Digital/subejct-specific-dates-move-conditionals-to-method
  • c34b3d6 Remove acronyms from rspec variable names
  • 3d812bf Merge pull request #1113 from DFE-Digital/feature/subject-specific-dates-simplify-supports-subject-assignment-se-1804-11
  • 130da94 Move conditional into method on configuration
  • 0b9d5c9 Simplify form setup by not merging params
  • 8f4e8c8 Only check in the degree subject from the list if degree stage is chosen
  • 76fd53a Use EmailFormatValidator in PersonalInformation
  • e30432a Patch shoulda-matchers to catch duplicated validation messages
  • 812ba0a Use the supplied web address in the validation
  • 8a5dea8 Added custom validator for format of email addresses
  • 3ff3113 replace if not with unless
  • 9a35805 Merge pull request #1110 from DFE-Digital/feature/make-confirm-attendance-back-button-grey
  • a0dcc4f Replace if not with unless
  • ac5f82f Fix param to appease the linter
  • 1d5a1ab Make back button on confirm attendance screen a secondary button
  • 967b94c Standardise subject and date info controller
  • e14e29f Fix specs now column default has changed
  • c6e1888 Merge pull request #1107 from DFE-Digital/feature/subject-specific-dates-remove-wip-flags-se-1804-10
  • 1bfe652 Merge pull request #1106 from DFE-Digital/feature/subject-specfic-dates-rework-combined-ids-se-1804-8
  • d4cf225 Merge pull request #1108 from DFE-Digital/dont-preselect-supports-subjects
  • c1ee8ae Fix combined_id method and add spec covering it
  • 377d69f Remove column default on supports_subjects
  • 1b843d0 Update placement features to reflect new wizard
  • f3c9cf6 Merge pull request #1093 from DFE-Digital/SE-1843/remove-access-needs-feature-flag
  • 25a9d67 Revised how subject specific dates show their dates
  • f04f81a Merge pull request #1105 from DFE-Digital/feature/subject-specific-dates-minor-fixes-se-1804-9
  • 6f15192 Fix failing spec caused by rebase
  • 020eb20 Rename date variable to placement_date
  • 48e9516 Move dealing with combined id params to object
  • f92970f Rewrite struct to take one id rather than two
  • 12447ff Fix specific typo
  • 364b49b Remove wip tag from fixed page contents feature
  • fc583d8 Merge pull request #1095 from DFE-Digital/dependabot/npm_and_yarn/master/core-js-3.3.5
  • f636400 Merge pull request #1103 from DFE-Digital/dependabot/bundler/master/brakeman-4.7.1
  • 9a721a0 Merge branch 'development' into SE-1843/remove-access-needs-feature-flag
  • f752b98 Added missing timeout to Auth requests
  • 1e8357f Merge pull request #1104 from DFE-Digital/remove-subject-and-date-id-from-subject-and-date-info
  • c943eeb Merge branch 'feature/subject-specific-dates-se-1804' into remove-subject-and-date-id-from-subject-and-date-info
  • 3f144c8 Replace 'if not' with unless
  • 1c77c51 Pass profile into the start_request partial
  • 2d36344 Remove html_safe, it didn't appear to be required
  • 989edec Merge pull request #1102 from DFE-Digital/subject-specific-dates/subject-and-date-information-validations
  • 17c8888 Merge branch 'feature/subject-specific-dates-se-1804' into subject-specific-dates/subject-and-date-information-validations
  • 4d70f15 Merge pull request #1100 from DFE-Digital/subject-specific-dates/remove-date-subject-id-from-placement-requests
  • a870b81 Merge pull request #1099 from DFE-Digital/feature/add-durations-to-date-listing-on-school-profile-se-1804-7
  • 206955c Replace storing placement_date_subject with subject
  • 2abad74 Bump brakeman from 4.7.0 to 4.7.1
  • 830f961 Update validations on SubjectAndDateInformation
  • a1f9757 Bump core-js from 3.3.3 to 3.3.5
  • ba7e569 Merge pull request #1101 from DFE-Digital/development
  • 14e502a Remove placment_date_subject_and_id from BPRs

This list of changes was auto generated.