Skip to content

Commit 363a122

Browse files
authored
Merge pull request #627 from City-of-Helsinki/dev
Dev to main
2 parents 8c754ed + 520579b commit 363a122

37 files changed

Lines changed: 641 additions & 511 deletions

File tree

.github/pull_request_template.md

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,38 @@
11
# [UHF-0000](https://helsinkisolutionoffice.atlassian.net/browse/UHF-0000)
2-
<!-- What problem does this solve? -->
32

43
## What was done
5-
<!-- Describe what was done -->
6-
7-
* This thing was fixed
4+
<!-- Describe what was done, f.e. fixed bug in accordion javascript. -->
5+
*
86

97
## How to install
10-
11-
* Make sure your instance is up and running on correct branch.
12-
* `git checkout UHF-0000_insert_correct_branch`
8+
<!-- Describe steps how to install the features. Default steps are provided. -->
9+
* Make sure your instance is up and running latest version of dev-branch
10+
* `git checkout dev && git pull origin dev`
1311
* `make fresh`
14-
* Run `make drush-cr`
12+
* Switch to feature branch
13+
* `git fetch && git checkout UHF-0000_insert_correct_branch`
14+
* Run code updates
15+
* `composer install`
16+
* `make drush-deploy drush-locale-update drush-cr`
1517

1618
## How to test
17-
<!-- Describe steps how to test the features, add as many steps as you want to be tested -->
18-
19-
* [ ] Check that this feature works
20-
* [ ] Check that code follows our standards
21-
22-
## Continuous documentation
23-
<!-- One of the checkboxes below needs to be checked like this: `[x]` (or click when not in edit mode) -->
19+
<!-- Describe steps how to test the features. Add as many steps as you want to be tested -->
20+
* [ ] 
21+
* [ ] Check that the code follows our standards
2422

25-
* [ ] This feature has been documented/the documentation has been updated
26-
* [ ] This change doesn't require updates to the documentation
23+
<!--
24+
Check list for the developer
2725
28-
## Translations
29-
<!-- The checkbox below needs to be checked like this: `[x]` (or click when not in edit mode). Not needed if the translations were not affected. -->
26+
Privacy
27+
- Do the changes you made have an impact on privacy? If you are unsure, please check the checklist at: https://helsinkisolutionoffice.atlassian.net/wiki/spaces/HEL/pages/9930473479/Tietosuojan+tarkistuslista+kehitt+jille
3028
31-
* [ ] Translations have been added to .po -files and included in this PR
29+
Documentation
30+
- Check the documentation exists and is up to date. Add link if the documentation is not included in the PR.
3231
33-
## Other PRs
34-
<!-- For example an related PR in another repository -->
32+
Translations
33+
- Make sure all necessary translations have been added.
34+
-->
3535

36-
* Link to other PR
36+
## Links to related PRs
37+
<!-- F.e. a related PR in another repository -->
38+
*

.github/workflows/artifact.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ name: Build artifacts
88
jobs:
99
build:
1010
uses: city-of-helsinki/drupal-gh-actions/.github/workflows/build-artifact.yml@main
11+
secrets:
12+
sentry_crons: ${{ secrets.SENTRY_CRONS }}
13+

.platform/schema

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20
1+
23

composer.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
"require": {
1010
"composer/installers": "^2.0",
1111
"cweagans/composer-patches": "^1.6.7",
12-
"drupal/core": "^10.0",
13-
"drupal/core-composer-scaffold": "^10.0",
12+
"drupal/core-composer-scaffold": "^10|^11",
1413
"drupal/hdbt": "^6.0",
1514
"drupal/hdbt_admin": "^3.0",
1615
"drupal/helfi_azure_fs": "^2.0",
@@ -20,12 +19,13 @@
2019
"drupal/helfi_proxy": "^3.0",
2120
"drupal/helfi_tpr": "^2.0",
2221
"drupal/helfi_tunnistamo": "^3.0",
23-
"drupal/redis": "^1.5"
22+
"drupal/redis": "^1.5",
23+
"mglaman/composer-drupal-lenient": "*"
2424
},
2525
"require-dev": {
2626
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
2727
"dg/bypass-finals": "^1.5",
28-
"drupal/core-dev": "^10",
28+
"drupal/core-dev": "^10|^11",
2929
"jangregor/phpstan-prophecy": "^1.0",
3030
"phpstan/phpstan-deprecation-rules": "^1.1",
3131
"weitzman/drupal-test-traits": "^2.1"
@@ -43,7 +43,8 @@
4343
"drupal/core-composer-scaffold": true,
4444
"php-http/discovery": false,
4545
"phpstan/extension-installer": true,
46-
"tbachert/spi": false
46+
"tbachert/spi": false,
47+
"mglaman/composer-drupal-lenient": true
4748
},
4849
"audit": {
4950
"abandoned": "report",
@@ -92,6 +93,9 @@
9293
},
9394
"patchLevel": {
9495
"drupal/core": "-p2"
96+
},
97+
"drupal-lenient": {
98+
"allowed-list": ["drupal/big_pipe_sessionless"]
9599
}
96100
},
97101
"repositories": [

0 commit comments

Comments
 (0)