jenkins-bot has submitted this change and it was merged.

Change subject: Move formatters from lib to repo
......................................................................


Move formatters from lib to repo

They are only used in repo.

Change-Id: Ib86ab7d301533335e466b9bfcee09126844795fc
---
M lib/resources/Resources.php
M repo/resources/Resources.php
R repo/resources/formatters/getApiBasedValueFormatterConstructor.js
R repo/resources/formatters/getStore.js
R repo/resources/formatters/resources.php
5 files changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Thiemo Mättig (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index c2e7f1f..39e1dc3 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -145,7 +145,6 @@
                include( __DIR__ . '/api/resources.php' ),
                include( __DIR__ . '/deprecated/resources.php' ),
                include( __DIR__ . '/experts/resources.php' ),
-               include( __DIR__ . '/formatters/resources.php' ),
                include( __DIR__ . '/jquery.wikibase/resources.php' ),
                include( __DIR__ . '/parsers/resources.php' ),
                include( __DIR__ . '/wikibase.RepoApi/resources.php' )
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index 7715efc..f60a020 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -229,6 +229,7 @@
        return array_merge(
                $modules,
                include( __DIR__ . '/entityChangers/resources.php' ),
+               include( __DIR__ . '/formatters/resources.php' ),
                include( __DIR__ . '/store/resources.php' ),
                include( __DIR__ . '/utilities/resources.php' )
        );
diff --git a/lib/resources/formatters/getApiBasedValueFormatterConstructor.js 
b/repo/resources/formatters/getApiBasedValueFormatterConstructor.js
similarity index 100%
rename from lib/resources/formatters/getApiBasedValueFormatterConstructor.js
rename to repo/resources/formatters/getApiBasedValueFormatterConstructor.js
diff --git a/lib/resources/formatters/getStore.js 
b/repo/resources/formatters/getStore.js
similarity index 100%
rename from lib/resources/formatters/getStore.js
rename to repo/resources/formatters/getStore.js
diff --git a/lib/resources/formatters/resources.php 
b/repo/resources/formatters/resources.php
similarity index 100%
rename from lib/resources/formatters/resources.php
rename to repo/resources/formatters/resources.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib86ab7d301533335e466b9bfcee09126844795fc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <[email protected]>
Gerrit-Reviewer: Adrian Lang <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to