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
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
drupal
Commits
2d500c61
Commit
2d500c61
authored
Feb 4, 2022
by
Jess
Browse files
Options
Downloads
Plain Diff
Merge 9.2.12, resolve merge conflicts, and update lockfile and dev versions.
parents
f5659cce
d42b0a45
No related branches found
No related tags found
2 merge requests
!10011
Issue #3200534 by quietone, longwave, Kristen Pol: Use dataprovider for...
,
!2521
Issue #3185775: Place Views preview on the side on large monitors
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
composer.json
+5
-0
5 additions, 0 deletions
composer.json
composer.lock
+11
-10
11 additions, 10 deletions
composer.lock
composer/Metapackage/CoreRecommended/composer.json
+1
-1
1 addition, 1 deletion
composer/Metapackage/CoreRecommended/composer.json
core/lib/Drupal.php
+1
-1
1 addition, 1 deletion
core/lib/Drupal.php
with
18 additions
and
12 deletions
composer.json
+
5
−
0
View file @
2d500c61
...
@@ -51,6 +51,11 @@
...
@@ -51,6 +51,11 @@
"autoloader-suffix"
:
"Drupal9"
,
"autoloader-suffix"
:
"Drupal9"
,
"platform"
:
{
"platform"
:
{
"php"
:
"7.3.0"
"php"
:
"7.3.0"
},
"allow-plugins"
:
{
"composer/installers"
:
true
,
"drupal/core-project-message"
:
true
,
"drupal/core-vendor-hardening"
:
true
}
}
},
},
"extra"
:
{
"extra"
:
{
...
...
This diff is collapsed.
Click to expand it.
composer.lock
+
11
−
10
View file @
2d500c61
...
@@ -4414,26 +4414,27 @@
...
@@ -4414,26 +4414,27 @@
},
},
{
{
"name": "twig/twig",
"name": "twig/twig",
"version": "v2.14.
6
",
"version": "v2.14.
11
",
"source": {
"source": {
"type": "git",
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "
27e5cf2b05e3744accf39d4c68a3235d9966d260
"
"reference": "
66baa66f29ee30e487e05f1679903e36eb01d727
"
},
},
"dist": {
"dist": {
"type": "zip",
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/
27e5cf2b05e3744accf39d4c68a3235d9966d260
",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/
66baa66f29ee30e487e05f1679903e36eb01d727
",
"reference": "
27e5cf2b05e3744accf39d4c68a3235d9966d260
",
"reference": "
66baa66f29ee30e487e05f1679903e36eb01d727
",
"shasum": ""
"shasum": ""
},
},
"require": {
"require": {
"php": ">=7.
2.5
",
"php": ">=7.
1.3
",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-mbstring": "^1.3"
"symfony/polyfill-mbstring": "^1.3",
"symfony/polyfill-php72": "^1.8"
},
},
"require-dev": {
"require-dev": {
"psr/container": "^1.0",
"psr/container": "^1.0",
"symfony/phpunit-bridge": "^4.4.9|^5.0.9"
"symfony/phpunit-bridge": "^4.4.9|^5.0.9
|^6.0
"
},
},
"type": "library",
"type": "library",
"extra": {
"extra": {
...
@@ -4477,7 +4478,7 @@
...
@@ -4477,7 +4478,7 @@
],
],
"support": {
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
"issues": "https://github.com/twigphp/Twig/issues",
"source": "https://github.com/twigphp/Twig/tree/v2.14.
6
"
"source": "https://github.com/twigphp/Twig/tree/v2.14.
11
"
},
},
"funding": [
"funding": [
{
{
...
@@ -4489,7 +4490,7 @@
...
@@ -4489,7 +4490,7 @@
"type": "tidelift"
"type": "tidelift"
}
}
],
],
"time": "202
1
-0
5-16T12:12:47
+00:00"
"time": "202
2
-0
2-04T06:57:25
+00:00"
},
},
{
{
"name": "typo3/phar-stream-wrapper",
"name": "typo3/phar-stream-wrapper",
...
@@ -8017,5 +8018,5 @@
...
@@ -8017,5 +8018,5 @@
"platform-overrides": {
"platform-overrides": {
"php": "7.3.0"
"php": "7.3.0"
},
},
"plugin-api-version": "2.
1
.0"
"plugin-api-version": "2.
2
.0"
}
}
This diff is collapsed.
Click to expand it.
composer/Metapackage/CoreRecommended/composer.json
+
1
−
1
View file @
2d500c61
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
"symfony/validator"
:
"v4.4.25"
,
"symfony/validator"
:
"v4.4.25"
,
"symfony/var-dumper"
:
"v5.3.0"
,
"symfony/var-dumper"
:
"v5.3.0"
,
"symfony/yaml"
:
"v4.4.25"
,
"symfony/yaml"
:
"v4.4.25"
,
"twig/twig"
:
"v2.14.
6
"
,
"twig/twig"
:
"v2.14.
11
"
,
"typo3/phar-stream-wrapper"
:
"v3.1.6"
"typo3/phar-stream-wrapper"
:
"v3.1.6"
}
}
}
}
This diff is collapsed.
Click to expand it.
core/lib/Drupal.php
+
1
−
1
View file @
2d500c61
...
@@ -75,7 +75,7 @@ class Drupal {
...
@@ -75,7 +75,7 @@ class Drupal {
/**
/**
* The current system version.
* The current system version.
*/
*/
const
VERSION
=
'9.2.1
2
-dev'
;
const
VERSION
=
'9.2.1
3
-dev'
;
/**
/**
* Core API compatibility.
* Core API compatibility.
...
...
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