[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[wmf/1.29.0-wmf.11]: Change beta feature info and talk links

2017-02-13 Thread Addshore (Code Review)
Addshore has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/337186 )

Change subject: Change beta feature info and talk links
..


Change beta feature info and talk links

Change-Id: Idf21f6958489e3a8cfe4de47a527d23b7712f9ee
---
M includes/TwoColConflictHooks.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Addshore: Verified; Looks good to me, approved
  WMDE-Fisch: Looks good to me, but someone else must approve



diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php
index 0648e8b..574a799 100644
--- a/includes/TwoColConflictHooks.php
+++ b/includes/TwoColConflictHooks.php
@@ -49,9 +49,9 @@
'rtl' => 
"$extensionAssetsPath/TwoColConflict/resources/TwoColConflict-beta-features-rtl.svg",
],
'info-link'
-   => 
'https://meta.wikimedia.org/wiki/WMDE_Technical_Wishes/Edit_Conflicts',
+   => 
'https://www.mediawiki.org/wiki/Help:Two_Column_Edit_Conflict_View',
'discussion-link'
-   => 
'https://meta.wikimedia.org/wiki/Talk:WMDE_Technical_Wishes/Edit_Conflicts',
+   => 
'https://www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_View',
];
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/337186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf21f6958489e3a8cfe4de47a527d23b7712f9ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: wmf/1.29.0-wmf.11
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[wmf/1.29.0-wmf.11]: Change beta feature info and talk links

2017-02-10 Thread Addshore (Code Review)
Addshore has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/337186 )

Change subject: Change beta feature info and talk links
..

Change beta feature info and talk links

Change-Id: Idf21f6958489e3a8cfe4de47a527d23b7712f9ee
---
M includes/TwoColConflictHooks.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/86/337186/1

diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php
index 0648e8b..574a799 100644
--- a/includes/TwoColConflictHooks.php
+++ b/includes/TwoColConflictHooks.php
@@ -49,9 +49,9 @@
'rtl' => 
"$extensionAssetsPath/TwoColConflict/resources/TwoColConflict-beta-features-rtl.svg",
],
'info-link'
-   => 
'https://meta.wikimedia.org/wiki/WMDE_Technical_Wishes/Edit_Conflicts',
+   => 
'https://www.mediawiki.org/wiki/Help:Two_Column_Edit_Conflict_View',
'discussion-link'
-   => 
'https://meta.wikimedia.org/wiki/Talk:WMDE_Technical_Wishes/Edit_Conflicts',
+   => 
'https://www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_View',
];
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/337186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf21f6958489e3a8cfe4de47a527d23b7712f9ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: wmf/1.29.0-wmf.11
Gerrit-Owner: Addshore 
Gerrit-Reviewer: WMDE-Fisch 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits