Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.42 update #211

Open
wants to merge 11 commits into
base: REL1_42
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
264 changes: 121 additions & 143 deletions Dockerfile

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions _sources/canasta/DockerSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ function isEnvTrue( $name ): bool {
'DeleteBatch',
'Description2',
'Disambiguator',
'DiscussionTools',
'DiscussionTools', # bundled
'DismissableSiteNotice',
'DisplayTitle',
'DynamicPageList3',
'Echo',
'Echo', # bundled
'EditAccount',
'Editcount',
'Elastica',
Expand Down Expand Up @@ -115,10 +115,11 @@ function isEnvTrue( $name ): bool {
'Lingo',
'LinkSuggest',
'LinkTarget',
'Linter',
'Linter', # bundled
'LiquidThreads',
'LockAuthor',
'Lockdown',
'LoginNotify', # bundled
'LookupUser',
'Loops',
'LuaCache',
Expand Down Expand Up @@ -158,7 +159,6 @@ function isEnvTrue( $name ): bool {
'PubmedParser',
'RegularTooltips',
'RemoteWiki',
'Renameuser', # bundled
'ReplaceText', # bundled
'RevisionSlider',
'RottenLinks',
Expand Down Expand Up @@ -199,7 +199,7 @@ function isEnvTrue( $name ): bool {
'TemplateStyles',
'TemplateWizard',
'TextExtracts', # bundled
'Thanks',
'Thanks', # bundled
'TinyMCE',
'TitleBlacklist', # bundled
'TitleIcon',
Expand Down
4 changes: 2 additions & 2 deletions _sources/configs/composer.wikiteq.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"mediawiki/semantic-media-wiki": "4.1.1",
"mediawiki/semantic-media-wiki": "4.2.0",
"mediawiki/chameleon-skin": "4.2.1",
"mediawiki/bootstrap-components": "5.0.0",
"mediawiki/mermaid": "3.1.0",
Expand All @@ -9,7 +9,7 @@
"mediawiki/semantic-extra-special-properties": "3.0.2",
"mediawiki/semantic-result-formats": "4.0.2",
"mediawiki/semantic-scribunto": "2.2.0",
"mediawiki/simple-batch-upload": "1.9.0",
"mediawiki/simple-batch-upload": "2.0.1",
"mediawiki/sub-page-list": "2.0.2",
"mediawiki/maps": "10.2.0",
"mediawiki/semantic-watchlist": "dev-master#8080e3e8d6f4689beeca6ab57ed9255502e175b2"
Expand Down
14 changes: 0 additions & 14 deletions _sources/patches/GoogleLogin.monolog.diff

This file was deleted.

25 changes: 25 additions & 0 deletions _sources/patches/GoogleLogin.monolog.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 0c99843af590300edf7322fdbc4e318d63272ebe Mon Sep 17 00:00:00 2001
From: Daniel Scherzer <[email protected]>
Date: Sun, 25 Aug 2024 21:07:08 -0700
Subject: [PATCH] Relax `monolog/monolog` dependency

---
composer.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 3bec35c..4fd3816 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
"license": "MIT",
"require": {
"google/apiclient": "^2.0.0@RC",
- "monolog/monolog": "~2.2.0"
+ "monolog/monolog": "^2.2.0"
},
"require-dev": {
"mediawiki/mediawiki-codesniffer": "41.0.0",
--
2.43.0.windows.1

26 changes: 0 additions & 26 deletions _sources/patches/flow-conversion-utils.patch

This file was deleted.

Loading