Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop branch to main - removing develop branch #579

Merged
merged 24 commits into from
Jan 27, 2022
Merged

Merge develop branch to main - removing develop branch #579

merged 24 commits into from
Jan 27, 2022

Conversation

ebrett
Copy link
Contributor

@ebrett ebrett commented Jan 27, 2022

No ticket for this PR - just tech debt to remove the develop branch which proved unhelpful.

agoldstone93 and others added 23 commits January 4, 2022 16:23
Co-authored-by: Adam Goldstone <adam.goldstone@education.gov.uk>
* remove back button from edit page screen

* update syntax to newer form of key value assignment, move class assignment outside data assignment

* changed behaviour so clicking cancel returns to previous screen

* Add space to end of hash

Co-authored-by: Rob Nichols <reggieb@users.noreply.github.com>

Co-authored-by: Rob Nichols <reggieb@users.noreply.github.com>
* aws-sdk-s3
* devise-security
* rails gems to 6.1.4.4
  actioncable
  actionmailbox
  actionmailer
  actionpack
  actiontext
  actionview
  activejob
  activemodel
  activerecord
  activestorage
  activesupport
  railsties
* govspeak
* remove other useful resources section

* add newline at end of file
#545)

* change from flexbox to grid so last line of grid aligns left

* change column width to correct calculation
* add gem-c-govspeak class to articles

* move gem-c-govspeak class to govuk-body, add to article preview
* Add feature image helper to properly format images for articles

Added proper styling to the admin preview page, which was missing

* Include thumbnail images on index page

* Add guard to helper

* Use alt text for title attribute
* refactor content blocks into admin namespace

* WIP: refactor content assets into admin namespace

* refactor content blocks into admin namespace

* remove commented out code

* refactor contentPage & versions to admin namespace

* minor changes to back button positions

* fix rubocop issues

* refactor specs

* refactor specs

* delete routing specs

* fix typo

* add 404 redirect

* refactor feature specs for admin paths

* refactor request specs for admin path

* refactor view specs for admin paths

* refactor for admin path

* correct path

* add description

* fix syntax errors

* fix content_pages rspec

* remove unnecessary comments
* Update using `yarn upgrade --latest`

* Update listen gem

* Upgrade using bundle update
* remove duplicate and flaky spec

* remove empty spec
Still some concern with the issue that Youtube snippets will not go
go through the sanitize method
* Add styling from govuk_publishing_component

* Move contents list style within govspeak

* Revert to using the margins on li elements
* add preview of live to controller and route

* add preview label to draft preview page

* update links to preview of live page

* update preview of live page link

* add preview of live page

* add preview live spec

* correct id

* correct path

* move to one line

* add newline

* remove creation of new copy of content page

* add aria labels for context

Co-authored-by: Brett McHargue <ebrett@users.noreply.github.com>
* change header text

* change label classes so now smaller text

* move line break inside conditional, remove unnecessary line break

* change call to action wording

Co-authored-by: Brett McHargue <ebrett@users.noreply.github.com>
* change sign out redirect to page that user was previously on

* add rubocop suggestions

* - update failing specs with new behaviour
- remove duplicate specs

Co-authored-by: Brett McHargue <ebrett@users.noreply.github.com>
@ebrett ebrett added this to the v1.10.5 milestone Jan 27, 2022
@github-actions
Copy link

@reggieb
Copy link
Contributor

reggieb commented Jan 27, 2022

Monster - but needs to be done!

@ebrett ebrett merged commit 7e049a2 into main Jan 27, 2022
@ebrett ebrett deleted the develop branch February 8, 2022 12:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants