Skip to content
This repository was archived by the owner on Jan 7, 2025. It is now read-only.

Conversation

@finnlewis
Copy link
Member

As discussed, merge request into release branch before tagging.

In my opinion, this is just a sanity check to confirm the expected commits are going into the release.

All the merge requests that went into the master branch should already have been peer reviewed, so this could just be a 'lookls good to me' from those in the know.

Happy to hear your thoughts @andybroomfield @cjstevens78 @paulpopus

paul and others added 30 commits October 15, 2020 16:58
…ulp-issue98

Feature/improvements to gulp issue98
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.20.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.15...4.17.20)

Signed-off-by: dependabot[bot] <support@github.com>
…tchers so it can be tested as a first pass
- Uncomments the logo line.
- Adds theme variables for site name and slogan
- Uses the site name as the alt and title text
- Fix the max height of the logo to 100px (6.25rem)
Replace placeholder with theme set logo
…urcemaps

Fix linting issues and fix sourcemap URLs
andybroomfield and others added 21 commits October 22, 2020 16:05
- Apply the menu colums logic to the mega row menus
- Use bootstrap classes on Drupal menu templates
- Nudge the padding and margin in the megarow menu and the responsive menu
…odash-4.17.20

Bump lodash from 4.17.15 to 4.17.20
Use the Drupal defined menu for the primary navigation
Add 6 footer regions (3 upper and 3 lower).
Use markup same as template to wrap regions
…-stylesheet

Add new stylesheet for CK editor iframes
…on-favicons

Replace the croydon icon with a placeholder
Copy link
Collaborator

@paulpopus paulpopus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, I think tests need to be sorted out but that will happen in another issue.

@finnlewis
Copy link
Member Author

It would be nice to see the tests pass, but I would not object to this being merged if urgent.

If we can wait for this to be merged localgovdrupal/localgov_project#24 then we will have the satisfaction of seeing the tests pass before merging.

I realise I ended up creating the PR @cjstevens78 - sorry - which means I should really merge it. But like I say, happy for you to if you need it sooner.

@finnlewis
Copy link
Member Author

finnlewis commented Oct 27, 2020

Oh - actually, all the tests do pass: OK (74 tests, 1095 assertions)

It's only the PHPO error that's triggering the failure:

PHP Fatal error:  Uncaught ArgumentCountError: Too few arguments to function DrupalPractice\Sniffs\CodeAnalysis\ScopeInfo::__construct(), 0 passed in /var/www/html/vendor/squizlabs/php_codesniffer/src/Ruleset.php on line 1209 and exactly 1 expected in /var/www/html/vendor/drupal/coder/coder_sniffer/DrupalPractice/Sniffs/CodeAnalysis/VariableAnalysisSniff.php:49

@Adnan-cds
Copy link
Contributor

It's only the PHPO error that's triggering the failure:

All good now. Thanks for promptly dealing with localgovdrupal/localgov_project#24 :)

@finnlewis finnlewis merged commit 1f45312 into release Oct 28, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants