Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Drupal Environment
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Composer
plugin
Drupal Environment
Commits
96dc136e
Commit
96dc136e
authored
1 year ago
by
danielspeicher
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
9d1a5dd3
764615e3
No related branches found
No related tags found
1 merge request
!55
Merging develop into main
Pipeline
#867853
passed
1 year ago
Stage: test
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
patches/d10.json
+4
-5
4 additions, 5 deletions
patches/d10.json
patches/d9.json
+4
-5
4 additions, 5 deletions
patches/d9.json
with
8 additions
and
10 deletions
patches/d10.json
+
4
−
5
View file @
96dc136e
...
...
@@ -16,9 +16,6 @@
"#3173340 Exception"
:
"https://www.drupal.org/files/issues/2020-09-26/3173340-2.background_image.Error-Call-to-a-member-function-hasEntityToken-on-bool-in-DrupalbackgroundimageCacheContextBackgroundImageSettingsTextCacheContextgetContext.patch"
,
"#3128542 FileScan"
:
"https://www.drupal.org/files/issues/2020-09-11/background_image-missing_folder-3128542-8.patch"
},
"drupal/bookable_calendar"
:
{
"#3349330 Display message"
:
"https://git.drupalcode.org/project/bookable_calendar/-/merge_requests/28.diff?v=2"
},
"drupal/bootstrap_clean_blog"
:
{
"#3146287 Drupal 9"
:
"https://www.drupal.org/files/issues/2021-10-23/3146287_3.patch"
},
...
...
@@ -78,7 +75,8 @@
},
"drupal/diff"
:
{
"#3311234 Link to diff with prev rev"
:
"https://git.drupalcode.org/project/diff/-/merge_requests/22.diff?v=3"
,
"#3311372 Configure date format"
:
"https://git.drupalcode.org/project/diff/-/merge_requests/23.diff?v=2"
"#3311372 Configure date format"
:
"https://git.drupalcode.org/project/diff/-/merge_requests/23.diff?v=2"
,
"#3360589 Form validation"
:
"https://git.drupalcode.org/project/diff/-/merge_requests/31.diff"
},
"drupal/dynamic_entity_reference"
:
{
"#3099176 Added new entity types"
:
"https://www.drupal.org/files/issues/2022-02-14/3099176-1.x-14.patch"
...
...
@@ -130,7 +128,8 @@
"#3319445 Permission check"
:
"https://git.drupalcode.org/project/gin_toolbar/-/merge_requests/25.diff"
},
"drupal/glossify"
:
{
"#3338553 PHP 8.1"
:
"https://git.drupalcode.org/project/glossify/-/merge_requests/10.diff"
"#3338553 PHP 8.1"
:
"https://git.drupalcode.org/project/glossify/-/merge_requests/10.diff"
,
"#3360633 HTML entities"
:
"https://git.drupalcode.org/project/glossify/-/merge_requests/13.diff"
},
"drupal/group"
:
{
"#3223957 Link to content entity"
:
"https://git.drupalcode.org/project/group/-/merge_requests/27.diff"
...
...
This diff is collapsed.
Click to expand it.
patches/d9.json
+
4
−
5
View file @
96dc136e
...
...
@@ -16,9 +16,6 @@
"#3173340 Exception"
:
"https://www.drupal.org/files/issues/2020-09-26/3173340-2.background_image.Error-Call-to-a-member-function-hasEntityToken-on-bool-in-DrupalbackgroundimageCacheContextBackgroundImageSettingsTextCacheContextgetContext.patch"
,
"#3128542 FileScan"
:
"https://www.drupal.org/files/issues/2020-09-11/background_image-missing_folder-3128542-8.patch"
},
"drupal/bookable_calendar"
:
{
"#3349330 Display message"
:
"https://git.drupalcode.org/project/bookable_calendar/-/merge_requests/28.diff?v=2"
},
"drupal/bootstrap_clean_blog"
:
{
"#3146287 Drupal 9"
:
"https://www.drupal.org/files/issues/2021-10-23/3146287_3.patch"
},
...
...
@@ -79,7 +76,8 @@
},
"drupal/diff"
:
{
"#3311234 Link to diff with prev rev"
:
"https://git.drupalcode.org/project/diff/-/merge_requests/22.diff?v=3"
,
"#3311372 Configure date format"
:
"https://git.drupalcode.org/project/diff/-/merge_requests/23.diff?v=2"
"#3311372 Configure date format"
:
"https://git.drupalcode.org/project/diff/-/merge_requests/23.diff?v=2"
,
"#3360589 Form validation"
:
"https://git.drupalcode.org/project/diff/-/merge_requests/31.diff"
},
"drupal/dynamic_entity_reference"
:
{
"#3099176 Added new entity types"
:
"https://www.drupal.org/files/issues/2022-02-14/3099176-1.x-14.patch"
...
...
@@ -134,7 +132,8 @@
"#3319445 Permission check"
:
"https://git.drupalcode.org/project/gin_toolbar/-/merge_requests/25.diff"
},
"drupal/glossify"
:
{
"#3338553 PHP 8.1"
:
"https://git.drupalcode.org/project/glossify/-/merge_requests/10.diff"
"#3338553 PHP 8.1"
:
"https://git.drupalcode.org/project/glossify/-/merge_requests/10.diff"
,
"#3360633 HTML entities"
:
"https://git.drupalcode.org/project/glossify/-/merge_requests/13.diff"
},
"drupal/group"
:
{
"#3223957 Link to content entity"
:
"https://git.drupalcode.org/project/group/-/merge_requests/27.diff"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment