archwiki: merge LocalSettings.archlinux.org.php from the archwiki git repo into LocalSettings.php.j2

Merge LocalSettings.archlinux.org.php into LocalSettings.php.j2.

There is no need to separate these files since LocalSettings.archlinux.org.php is only used by ArchWiki. Keeping it all in one file provides a clearer view of what options are actually set.

Related to https://github.com/archlinux/archwiki/pull/31.

/cc @pierre @archlinux/teams/wiki/admins

marked this merge request as ready

marked this merge request as draft

added 18 commits

• 8eeb9472...a0526102 - 17 commits from branch archlinux:master
• 882f7a5e - archwiki: merge LocalSettings.archlinux.org.php from the archwiki git repo...

Compare with previous version

added 56 commits

• 515743d7 - Add public LocalSettings.archlinux.org.php config
• a0225ac3 - LocalSettings: move general settings to the top
• 101bb988 - LocalSettings: move database settings
• 18fa819e - LocalSettings: move email settings
• a68adeb5 - LocalSettings: move cache settings
• e5ab2bd4 - LocalSettings: add remaining section comments
• bd5383f3 - LocalSettings: update path to license icon
• 5b35eb3d - Remind LocalSettings.php variables
• 3cd3fe61 - LocalSettings: remove $wgDisableCounters
• e4ae63ba - LocalSettings: move $wgAllowUserCssPrefs to relevant section
• adc8b0ac - LocalSettings: Enable subpages in the main namespace
• 3eb2149c - LocalSettings: Hide "minordefault" and "forceeditsummary" user options
• 51d94d1b - LocalSettings: Enable support for userscripts and user-stylesheets
• 04abd20e - LocalSettings: add groups for AbuseFilter rules
• e13ad503 - Enable ParserFunctions extension
• a4147def - Enable Interwiki extension
• ffcc45e5 - Add menu entry to security.archlinux.org
• 1bf6c9de - Merge pull request #5 (closed) from archlinux/mobile
• 10bd0ee1 - Enable async job running
• 2be4c604 - Disable $wgJobRunRate
• 41b266ed - Keep structure of FooterIcons
• 1343bc1a - Fixed path in $wgLogo
• 8c35ed90 - Merge pull request #9 (closed) from archlinux/responsive
• a2d5bb69 - Merge pull request #10 (closed) from lahwaacz/master
• 2d30062c - Enable background jobs to fix slow category updating
• 6afa7787 - Revert "Enable background jobs to fix slow category updating"
• ff7fa7a3 - Revert "Revert "Enable background jobs to fix slow category updating""
• bc17c043 - Revert "Revert "Revert "Enable background jobs to fix slow category updating"""
• 7aaee3cb - Add extensions/TitleKey
• af4a8bc0 - Add BounceHandler extension
• 58c5d873 - Enable write API for BounceHandler
• 1de09abe - Load all extensions using the new wfLoadExtension function
• ef2920dc - Start migration towards HTML5-style link fragments
• 7ca1a541 - Merge branch 'permissions2' of https://github.com/kynikos/archlinux-mediawiki
• d8a40dde - Configure permissions as empty arrays
• af53487b - Finish migration to HTML5-style link fragments
• a476e49c - Replace the custom FunnyQuestion extension by ConfirmEdit/QuestyCaptcha
• c87029d6 - Lock down history pages to reduce server load
• 1012502f - Disable more pages that link to page diffs
• fd8745df - LocalSettings: set $wgLogo to an empty strig
• dc5f6d2f - Set $wgCaptchaTriggers as true only for actions related to login/account creation
• 52c0bc63 - Merge branch 'nl6720-DeveloperWiki_namespace'
• c75ea828 - Update access levels: add a new access level called "privileged"
• bf31e95f - Update access levels: add additional rights to sysops
• a06241ff - Protect against accidental use of the rollback feature
• a01c2950 - Add an "administrator_fellow" user role for retired wiki administrators
• 01278ce4 - Add and load extensions required for wiki maintenance
• ebc8580d - Semi-protect the Template namespace
• 0cf43ee1 - Update deprecated $wgLogo to $wgLogos
• 31d7ff64 - Switch to WikiEditor as the editing interface and use CodeMirror for syntax highlighting
• cea63d89 - Update group permissions for AbuseFilter
• cb110bde - Allow to change the page language
• 4f60eda1 - LocalSettings: enable new Vector by default
• cc88abbf - LocalSettings: enable new Vector by default for new accounts
• 46424dfe - Move LocalSettings.php to roles/archwiki/templates/ for integrating to the infrastructure repo
• 0acb9b58 - Merge branch 'archwiki-LocalSettings.php-move-to-templates' into archwiki-LocalSettings.php

Compare with previous version

With some effort, I imported the full history of LocalSettings.archlinux.org.php.

git blame works: https://gitlab.archlinux.org/nl6720/infrastructure/-/blame/archwiki-LocalSettings.php/roles/archwiki/templates/LocalSettings.php.j2

GPG signatures are lost, though. None of the commits were signed.

marked this merge request as ready

added 55 commits

• 4387c5b8 - Add public LocalSettings.archlinux.org.php config
• 182ace2e - LocalSettings: move general settings to the top
• e64da13c - LocalSettings: move database settings
• 649f461b - LocalSettings: move email settings
• c960b518 - LocalSettings: move cache settings
• 34170719 - LocalSettings: add remaining section comments
• 2006c330 - LocalSettings: update path to license icon
• a71389a7 - Remind LocalSettings.php variables
• 23bfbed1 - LocalSettings: remove $wgDisableCounters
• e5fb73e9 - LocalSettings: move $wgAllowUserCssPrefs to relevant section
• 4d4ec619 - LocalSettings: Enable subpages in the main namespace
• 91782a3c - LocalSettings: Hide "minordefault" and "forceeditsummary" user options
• 4e117c73 - LocalSettings: Enable support for userscripts and user-stylesheets
• db890a69 - LocalSettings: add groups for AbuseFilter rules
• da7a7501 - Enable ParserFunctions extension
• e608a96c - Enable Interwiki extension
• d178541f - Add menu entry to security.archlinux.org
• 6bf39f5c - Merge pull request #5 (closed) from archlinux/mobile
• dc3bf869 - Enable async job running
• 677711c6 - Disable $wgJobRunRate
• 98be8961 - Keep structure of FooterIcons
• 574fef40 - Fixed path in $wgLogo
• aa84468e - Merge pull request #9 (closed) from archlinux/responsive
• 660f3c22 - Merge pull request #10 (closed) from lahwaacz/master
• 5f88c59f - Enable background jobs to fix slow category updating
• 581c4d43 - Revert "Enable background jobs to fix slow category updating"
• 914efd94 - Revert "Revert "Enable background jobs to fix slow category updating""
• a6a8844a - Revert "Revert "Revert "Enable background jobs to fix slow category updating"""
• 3fc62048 - Add extensions/TitleKey
• ecae727a - Add BounceHandler extension
• 41c20ffc - Enable write API for BounceHandler
• a8c29794 - Load all extensions using the new wfLoadExtension function
• 9e7914fb - Start migration towards HTML5-style link fragments
• ad0ed9a2 - Merge branch 'permissions2' of https://github.com/kynikos/archlinux-mediawiki
• c6c4f896 - Configure permissions as empty arrays
• c2ee5c7c - Finish migration to HTML5-style link fragments
• 83829ee9 - Replace the custom FunnyQuestion extension by ConfirmEdit/QuestyCaptcha
• c7ade69e - Lock down history pages to reduce server load
• 84034e25 - Disable more pages that link to page diffs
• be3d4c84 - LocalSettings: set $wgLogo to an empty strig
• aec78206 - Set $wgCaptchaTriggers as true only for actions related to login/account creation
• e3aad788 - Merge branch 'nl6720-DeveloperWiki_namespace'
• 7e861a8c - Update access levels: add a new access level called "privileged"
• f4d1d14d - Update access levels: add additional rights to sysops
• 053152d1 - Protect against accidental use of the rollback feature
• 51c02e73 - Add an "administrator_fellow" user role for retired wiki administrators
• ea272777 - Add and load extensions required for wiki maintenance
• 85780827 - Semi-protect the Template namespace
• c0f469fd - Update deprecated $wgLogo to $wgLogos
• b1eca8aa - Switch to WikiEditor as the editing interface and use CodeMirror for syntax highlighting
• 1a261404 - Update group permissions for AbuseFilter
• 406ff059 - Allow to change the page language
• 4e39b43f - LocalSettings: enable new Vector by default
• a7b0506b - LocalSettings: enable new Vector by default for new accounts
• ab5c0d2c - Merge branch 'archwiki-LocalSettings.php-move-to-templates' into archwiki-LocalSettings.php

Compare with previous version

marked this merge request as draft

added 338 commits

• ab5c0d2c...4fd89de7 - 299 commits from branch archlinux:master
• 809e9640 - Merge pull request https://github.com/archlinux/archwiki/pull/5 from archlinux/mobile
• d43b432f - Enable async job running
• 7bad20f0 - Disable $wgJobRunRate
• 0d544a3c - Keep structure of FooterIcons
• d5ee649b - Fixed path in $wgLogo
• f227e2d1 - Merge pull request https://github.com/archlinux/archwiki/pull/9 from archlinux/responsive
• 492f50cf - Merge pull request https://github.com/archlinux/archwiki/pull/10 from lahwaacz/master
• c83c076e - Enable background jobs to fix slow category updating
• 87f7be1d - Revert "Enable background jobs to fix slow category updating"
• ad930814 - Revert "Revert "Enable background jobs to fix slow category updating""
• 188efa51 - Revert "Revert "Revert "Enable background jobs to fix slow category updating"""
• 6e6c65f1 - Add extensions/TitleKey
• b3868472 - Add BounceHandler extension
• 7c8a18f8 - Enable write API for BounceHandler
• d80e0fad - Load all extensions using the new wfLoadExtension function
• dad083ca - Start migration towards HTML5-style link fragments
• acb11d7d - Merge branch 'permissions2' of https://github.com/kynikos/archlinux-mediawiki
• d50c964e - Configure permissions as empty arrays
• a49698c2 - Finish migration to HTML5-style link fragments
• de61f297 - Replace the custom FunnyQuestion extension by ConfirmEdit/QuestyCaptcha
• 867ef70f - Lock down history pages to reduce server load
• b02ca4ec - Disable more pages that link to page diffs
• f2203f67 - LocalSettings: set $wgLogo to an empty strig
• 9698c889 - Set $wgCaptchaTriggers as true only for actions related to login/account creation
• ea677e1c - Merge branch 'nl6720-DeveloperWiki_namespace'
• 028c5a8b - Update access levels: add a new access level called "privileged"
• b181a3e4 - Update access levels: add additional rights to sysops
• 191c702e - Protect against accidental use of the rollback feature
• de3012fc - Add an "administrator_fellow" user role for retired wiki administrators
• d4364bfe - Add and load extensions required for wiki maintenance
• 388936a6 - Semi-protect the Template namespace
• f5ecbb7c - Update deprecated $wgLogo to $wgLogos
• 7ff1df86 - Switch to WikiEditor as the editing interface and use CodeMirror for syntax highlighting
• dfedb0b4 - Update group permissions for AbuseFilter
• 7aaab840 - Allow to change the page language
• ea1f376c - LocalSettings: enable new Vector by default
• f473fb8c - LocalSettings: enable new Vector by default for new accounts
• 121985e8 - LocalSettings: load CodeEditor for syntax highlighting in JavaScript and CSS pages
• c7ba4e11 - archwiki: merge LocalSettings.archlinux.org.php from the archwiki git repo...

Compare with previous version

Documenting how to do this, because I forgot.

$ cd infrastructure
$ git checkout master
$ git checkout -b archwiki-LocalSettings.php-move-to-templates
$ git reset --hard d68c7e5474a4f8eab2c40ebef8ea05fbb33ae172
$ git config --local commit.gpgSign false
$ cd ../archwiki
$ git checkout master
$ git pull origin master
$ git checkout -b move-LocalSettings.php
$ git filter-branch -f --tree-filter 'if [ -f LocalSettings.archlinux.org.php ]; then mkdir -p roles/archwiki/templates && mv LocalSettings.archlinux.org.php roles/archwiki/templates/LocalSettings.php.j2; fi' HEAD
$ curl -LO 'https://gist.githubusercontent.com/alicanb/6d0833fc824f3985aa153721e0b0c3f5/raw/14adc4eb001be79c58680853226144f894815ba7/git-move.sh'
$ chmod +x ./git-move.sh
$ ./git-move.sh roles/archwiki/templates/LocalSettings.php.j2 ../infrastructure
$ cd ../infrastructure
$ git rebase --committer-date-is-author-date --interactive d68c7e5474a4f8eab2c40ebef8ea05fbb33ae172

The following commits need rewording (r):

1. Merge pull request #5 from archlinux/mobile. Replace # with https://github.com/archlinux/archwiki/pull/
2. Merge pull request #9 from archlinux/responsive. Replace # with https://github.com/archlinux/archwiki/pull/
3. Merge pull request #10 from lahwaacz/master. Replace # with https://github.com/archlinux/archwiki/pull/
4. Revert "Enable background jobs to fix slow category updating". Update the referenced commit sha. Use git log to find it.
5. Revert "Revert "Enable background jobs to fix slow category updating"". Update the referenced commit sha. Use git log to find it.
6. Revert "Revert "Revert "Enable background jobs to fix slow category updating""". Update the referenced commit sha. Use git log to find it.
7. Set $wgCaptchaTriggers as true only for actions related to login/account creation . Update the referenced commit sha. Use git log to find Replace the custom FunnyQuestion extension by ConfirmEdit/QuestyCaptcha.
8. Merge pull request #52 from nl6720/abusefilter-cosysop. Replace # with https://github.com/archlinux/archwiki/pull/

$ git checkout master
$ git config --local commit.gpgSign true
$ git checkout -b archwiki-LocalSettings.php
$ git merge archwiki-LocalSettings.php-move-to-templates

Manually fix roles/archwiki/templates/LocalSettings.php.j2 .

$ git add roles/archwiki/templates/LocalSettings.php.j2
$ git merge --continue

Use the following commit message:

archwiki: merge LocalSettings.archlinux.org.php from the archwiki git repo into LocalSettings.php.j2

Merge https://github.com/lahwaacz/archlinux-mediawiki/blob/cache/LocalSettings.archlinux.org.php.
There is no need to separate these files since LocalSettings.archlinux.org.php is only used by ArchWiki.
Keeping it all in one file provides a clearer view of what options are actually set.

Related to https://github.com/archlinux/archwiki/pull/31.

resolved all threads

added 39 commits

• 40372e5c - Merge pull request https://github.com/archlinux/archwiki/pull/5 from archlinux/mobile
• cb17e0d0 - Enable async job running
• c448cb3f - Disable $wgJobRunRate
• 3f661549 - Keep structure of FooterIcons
• 728d7e17 - Fixed path in $wgLogo
• 63a7add3 - Merge pull request https://github.com/archlinux/archwiki/pull/9 from archlinux/responsive
• 1204de11 - Merge pull request https://github.com/archlinux/archwiki/pull/10 from lahwaacz/master
• 73c1fc81 - Enable background jobs to fix slow category updating
• 79fa11ff - Revert "Enable background jobs to fix slow category updating"
• 7f92bc51 - Revert "Revert "Enable background jobs to fix slow category updating""
• 0e2298e1 - Revert "Revert "Revert "Enable background jobs to fix slow category updating"""
• b577772b - Add extensions/TitleKey
• e2043d8e - Add BounceHandler extension
• 7552847b - Enable write API for BounceHandler
• 9b8f4c77 - Load all extensions using the new wfLoadExtension function
• b2546442 - Start migration towards HTML5-style link fragments
• d6caa531 - Merge branch 'permissions2' of https://github.com/kynikos/archlinux-mediawiki
• 36daab25 - Configure permissions as empty arrays
• a2137c98 - Finish migration to HTML5-style link fragments
• 4f680e6f - Replace the custom FunnyQuestion extension by ConfirmEdit/QuestyCaptcha
• 7e969c50 - Lock down history pages to reduce server load
• d143fd2b - Disable more pages that link to page diffs
• bdfaca72 - LocalSettings: set $wgLogo to an empty strig
• f9703597 - Set $wgCaptchaTriggers as true only for actions related to login/account creation
• 36b63422 - Merge branch 'nl6720-DeveloperWiki_namespace'
• 1dd03b77 - Update access levels: add a new access level called "privileged"
• 9b979bd8 - Update access levels: add additional rights to sysops
• 7783aefb - Protect against accidental use of the rollback feature
• f9abdf7d - Add an "administrator_fellow" user role for retired wiki administrators
• b626b6b5 - Add and load extensions required for wiki maintenance
• 73d975f5 - Semi-protect the Template namespace
• 05deaf0b - Update deprecated $wgLogo to $wgLogos
• 5828f89b - Switch to WikiEditor as the editing interface and use CodeMirror for syntax highlighting
• 86948c75 - Update group permissions for AbuseFilter
• c7532e96 - Allow to change the page language
• 2f2ca53a - LocalSettings: enable new Vector by default
• cf7a0daa - LocalSettings: enable new Vector by default for new accounts
• 8d90db88 - LocalSettings: load CodeEditor for syntax highlighting in JavaScript and CSS pages
• 7c519034 - archwiki: merge LocalSettings.archlinux.org.php from the archwiki git repo...

Compare with previous version

@alad, your commits use the @archlinux.info email address. Do you want it changed?

changed the description

added 1 commit

• e826b728 - archwiki: merge LocalSettings.archlinux.org.php from the archwiki git repo...

Compare with previous version

added 1 commit

• 852a12f3 - archwiki: merge LocalSettings.archlinux.org.php from the archwiki git repo...

Compare with previous version

added 1 commit

• 25beb5da - archwiki: merge LocalSettings.archlinux.org.php from the archwiki git repo...

Compare with previous version

added 44 commits

• 363160e3 - 1 commit from branch archlinux:master
• de75b0c6 - Enable ParserFunctions extension
• d32fff67 - Enable Interwiki extension
• cbceac6a - Add menu entry to security.archlinux.org
• 6fa2da98 - Merge pull request https://github.com/archlinux/archwiki/pull/5 from archlinux/mobile
• f54ead25 - Enable async job running
• 06b0e19a - Disable $wgJobRunRate
• 40c5ddef - Keep structure of FooterIcons
• 432406a1 - Fixed path in $wgLogo
• 670e7576 - Merge pull request https://github.com/archlinux/archwiki/pull/9 from archlinux/responsive
• afa0815b - Merge pull request https://github.com/archlinux/archwiki/pull/10 from lahwaacz/master
• 4842de99 - Enable background jobs to fix slow category updating
• 70423bc6 - Revert "Enable background jobs to fix slow category updating"
• aae7d352 - Revert "Revert "Enable background jobs to fix slow category updating""
• 44a2fb2f - Revert "Revert "Revert "Enable background jobs to fix slow category updating"""
• 556d1488 - Add extensions/TitleKey
• 0d5dfe06 - Add BounceHandler extension
• 09f6c526 - Enable write API for BounceHandler
• 2a572315 - Load all extensions using the new wfLoadExtension function
• 72bfef89 - Start migration towards HTML5-style link fragments
• 7fae1057 - Merge branch 'permissions2' of https://github.com/kynikos/archlinux-mediawiki
• ea13826b - Configure permissions as empty arrays
• 71cd2dcc - Finish migration to HTML5-style link fragments
• 685f9eb9 - Replace the custom FunnyQuestion extension by ConfirmEdit/QuestyCaptcha
• 3767affb - Lock down history pages to reduce server load
• 12ffad86 - Disable more pages that link to page diffs
• e8662694 - LocalSettings: set $wgLogo to an empty strig
• 05f74698 - Set $wgCaptchaTriggers as true only for actions related to login/account creation
• d3392b2e - Merge branch 'nl6720-DeveloperWiki_namespace'
• 71ec6dcd - Update access levels: add a new access level called "privileged"
• 5c4557ac - Update access levels: add additional rights to sysops
• d10a32be - Protect against accidental use of the rollback feature
• 62aa048a - Add an "administrator_fellow" user role for retired wiki administrators
• e2112958 - Add and load extensions required for wiki maintenance
• ec62b798 - Semi-protect the Template namespace
• ec6cc4f2 - Update deprecated $wgLogo to $wgLogos
• 5770c076 - Switch to WikiEditor as the editing interface and use CodeMirror for syntax highlighting
• defe8c2d - Update group permissions for AbuseFilter
• af73182d - Allow to change the page language
• 6996ab6e - LocalSettings: enable new Vector by default
• 6a520b67 - LocalSettings: enable new Vector by default for new accounts
• 753cf55f - LocalSettings: load CodeEditor for syntax highlighting in JavaScript and CSS pages
• 0a90a753 - Merge pull request https://github.com/archlinux/archwiki/pull/52 from nl6720/abusefilter-cosysop
• 5f9a566c - archwiki: merge LocalSettings.archlinux.org.php from the archwiki git repo...

Compare with previous version

resolved all threads

marked this merge request as ready