diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2024-10-04 14:19:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2024-10-04 14:19:11 +0000 |
| commit | efab066bcf58a1605db399f7be2e66c85f3258c1 (patch) | |
| tree | 248172f688248e3e519394510340e67c175ed04d /includes/actions | |
| parent | f87af6fca89d3cc65f97a9822ffa0cd7dd88c8ea (diff) | |
| parent | f981602fb5b6189289b4bb47b841557e148cf9c7 (diff) | |
| download | mediawikicore-efab066bcf58a1605db399f7be2e66c85f3258c1.tar.gz mediawikicore-efab066bcf58a1605db399f7be2e66c85f3258c1.zip | |
Merge "Improve history merge log comments"
Diffstat (limited to 'includes/actions')
| -rw-r--r-- | includes/actions/HistoryAction.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php index c4b200f905c4..ac3df73feb1b 100644 --- a/includes/actions/HistoryAction.php +++ b/includes/actions/HistoryAction.php @@ -221,7 +221,7 @@ class HistoryAction extends FormlessAction { # show deletion/move log if there is an entry LogEventsList::showLogExtract( $out, - [ 'delete', 'move', 'protect' ], + [ 'delete', 'move', 'protect', 'merge' ], $this->getTitle(), '', [ 'lim' => 10, |