Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: govCMS/GovCMS
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.31.0
Choose a base ref
...
head repository: govCMS/GovCMS
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.x-develop
Choose a head ref
  • 9 commits
  • 3 files changed
  • 7 contributors

Commits on Jun 1, 2023

  1. Update dependabot.yml

    @pandaskii
    pandaskii authored Jun 1, 2023
    Copy the full SHA
    f6d61f2 View commit details

Commits on Jul 13, 2023

  1. [GOVCMSD9-1113] [SA-CONTRIB-2023-030] Upgrade to TFA 8.x-1.1 from 8.x… 

    …-1.0
    Tara committed Jul 13, 2023
    Copy the full SHA
    72f1bfa View commit details

Commits on Jul 14, 2023

  1. Merge pull request #806 from Tara-Wij/GOVCMSD9-1113 

    [GOVCMSD9-1113] [SA-CONTRIB-2023-030] Upgrade to TFA 8.x-1.1 from 8.x-1.0
    @suhyeonh
    suhyeonh authored Jul 14, 2023
    Copy the full SHA
    e67b713 View commit details

  2. update govcms version

    Suhyeon Hong committed Jul 14, 2023
    Copy the full SHA
    74daf0d View commit details

Commits on Jul 17, 2023

  1. Merge branch 'release/2.x/2.32.0' into 2.x-master

    Tara committed Jul 17, 2023
    Copy the full SHA
    38a0eb8 View commit details

Commits on Sep 21, 2023

  1. [GOVCMSD9-1205] Update Drupal core from 9.5.9 to 9.5.11

    @drupal-spider
    drupal-spider authored Sep 21, 2023
    Copy the full SHA
    17193c3 View commit details

  2. Merge pull request #865 from drupal-spider/GOVCMSD9-1205 

    [GOVCMSD9-1205] Update Drupal core from 9.5.9 to 9.5.11
    @ruwanl
    ruwanl authored Sep 21, 2023
    Copy the full SHA
    dca072c View commit details

  3. Update govcms.info.yml

    @Tara-Wij
    Tara-Wij authored Sep 21, 2023
    Copy the full SHA
    0e5bee4 View commit details

Commits on Sep 24, 2023

  1. Merge branch 'release/2.x/2.33.0' into 2.x-master

    Tara committed Sep 24, 2023
    Copy the full SHA
    b10a47a View commit details
Showing with 5 additions and 8 deletions.
  1. +2 −2 .github/dependabot.yml
  2. +2 −5 composer.json
  3. +1 −1 govcms.info.yml
4 changes: 2 additions & 2 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ updates:
interval: daily
time: "06:00"
timezone: "Australia/Sydney"
open-pull-requests-limit: 50
target-branch: 2.x-develop
open-pull-requests-limit: 20
target-branch: 3.x-develop
reviewers:
- pandaskii
7 changes: 2 additions & 5 deletions composer.json
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@
"drupal/contact_storage": "1.3.0",
"drupal/context": "4.1.0",
"drupal/core-composer-scaffold": "^9",
"drupal/core-recommended": "9.5.9",
"drupal/core-recommended": "9.5.11",
"drupal/devel": "5.1.1",
"drupal/crop": "2.3.0",
"drupal/ctools": "3.13.0",
@@ -130,7 +130,7 @@
"drupal/simple_oauth": "5.2.3",
"drupal/simple_sitemap": "4.1.4",
"drupal/swiftmailer": "2.4.0",
"drupal/tfa": "1.0.0",
"drupal/tfa": "1.1.0",
"drupal/token": "1.11.0",
"drupal/twig_tweak": "3.2.1",
"drupal/username_enumeration_prevention": "1.3.0",
@@ -179,9 +179,6 @@
"enable-patching": true,
"composer-exit-on-patch-failure": true,
"patches": {
"drupal/core": {
"[regression] route defaults are now automatically route parameters - https://www.drupal.org/project/drupal/issues/3358402": "https://www.drupal.org/files/issues/2023-05-10/3359511-revert-3277784-2.patch"
},
"drupal/login_security": {
"Correctly detect invalid username/password or blocked account login errors - https://www.drupal.org/project/login_security/issues/3292974": "https://www.drupal.org/files/issues/2023-02-14/login_security-3292974-21.patch"
},
2 changes: 1 addition & 1 deletion govcms.info.yml
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ type: profile
description: 'A GovCMS Drupal Distribution for government and the public sector in Australia.'
project: govcms
core_version_requirement: ^9
version: '2.31.0'
version: '2.33.0'

distribution:
name: GovCMS