Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
drupal
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
drupal
Commits
54b69d41
Commit
54b69d41
authored
3 weeks ago
by
catch
Browse files
Options
Downloads
Patches
Plain Diff
Issue
#3526117
by phenaproxima: Conflict with Project Browser <2.1 and Automatic Updates <4
(cherry picked from commit
b8089d1a
)
parent
db5e7aee
No related branches found
No related tags found
2 merge requests
!12462
Issue #3523109 by ghost of drupal past, donquixote, nicxvan, dww, larowlan,...
,
!12357
Issue #3529639 by mradcliffe, smustgrave, solomon.yifru: replacing a depricated css
Pipeline
#509075
passed with warnings
3 weeks ago
Stage: 🪄 Lint
Stage: 🗜️ Test
Pipeline: drupal
#509094
Pipeline: drupal
#509091
Pipeline: drupal
#509078
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
composer.lock
+3
-1
3 additions, 1 deletion
composer.lock
core/composer.json
+2
-0
2 additions, 0 deletions
core/composer.json
with
5 additions
and
1 deletion
composer.lock
+
3
−
1
View file @
54b69d41
...
...
@@ -497,7 +497,7 @@
"dist": {
"type": "path",
"url": "core",
"reference": "
3806cfdbb344a5c7ed6e8b78534454547ccd882a
"
"reference": "
9a3b93d8f495d3f101bcc2d39ce91695b57aece6
"
},
"require": {
"asm89/stack-cors": "^2.3",
...
...
@@ -550,6 +550,8 @@
"twig/twig": "^3.21.0"
},
"conflict": {
"drupal/automatic_updates": "<4",
"drupal/project_browser": "<2.1",
"drush/drush": "<12.4.3"
},
"replace": {
...
...
This diff is collapsed.
Click to expand it.
core/composer.json
+
2
−
0
View file @
54b69d41
...
...
@@ -54,6 +54,8 @@
"php-tuf/composer-stager"
:
"^2.0"
},
"conflict"
:
{
"drupal/automatic_updates"
:
"<4"
,
"drupal/project_browser"
:
"<2.1"
,
"drush/drush"
:
"<12.4.3"
},
"replace"
:
{
...
...
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