jenkins-bot has submitted this change and it was merged. Change subject: Change required package: twitter/bootstrap -> twbs/bootstrap ......................................................................
Change required package: twitter/bootstrap -> twbs/bootstrap Change-Id: I8dd1c863b6b5ac1826e236f0cc64b785fccbf3a5 --- M Bootstrap.php M composer.json M tests/phpunit/Hooks/SetupAfterCacheTest.php 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Foxtrott: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/Bootstrap.php b/Bootstrap.php index ad2ee52..a7deeae 100644 --- a/Bootstrap.php +++ b/Bootstrap.php @@ -49,7 +49,7 @@ /** * The extension version */ - define( 'BS_VERSION', '1.1.5' ); + define( 'BS_VERSION', '1.2-alpha' ); // register the extension $GLOBALS[ 'wgExtensionCredits' ][ 'other' ][ ] = array( @@ -77,8 +77,8 @@ $configuration = array(); $configuration[ 'IP' ] = $GLOBALS[ 'IP' ]; - $configuration[ 'localBasePath' ] = $GLOBALS[ 'IP' ] . '/vendor/twitter/bootstrap'; - $configuration[ 'remoteBasePath' ] = $GLOBALS[ 'wgScriptPath' ] . '/vendor/twitter/bootstrap'; + $configuration[ 'localBasePath' ] = $GLOBALS[ 'IP' ] . '/vendor/twbs/bootstrap'; + $configuration[ 'remoteBasePath' ] = $GLOBALS[ 'wgScriptPath' ] . '/vendor/twbs/bootstrap'; $setupAfterCache = new \Bootstrap\Hooks\SetupAfterCache( $configuration ); $setupAfterCache->process(); diff --git a/composer.json b/composer.json index efebe25..7879ba2 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "php" : ">=5.3.0", "composer/installers": "1.*,>=1.0.1", "oyejorge/less.php" : "~1.0,>=1.7.0.9", - "twitter/bootstrap" : "~3.0" + "twbs/bootstrap" : "~3.0" }, "autoload" : { "files": [ diff --git a/tests/phpunit/Hooks/SetupAfterCacheTest.php b/tests/phpunit/Hooks/SetupAfterCacheTest.php index 76125c2..4c40f9e 100644 --- a/tests/phpunit/Hooks/SetupAfterCacheTest.php +++ b/tests/phpunit/Hooks/SetupAfterCacheTest.php @@ -24,7 +24,7 @@ protected function setUp() { parent::setUp(); - $this->localBootstrapVendorPath = __DIR__ . '/../../../../../vendor/twitter/bootstrap'; + $this->localBootstrapVendorPath = __DIR__ . '/../../../../../vendor/twbs/bootstrap'; } public function testCanConstruct() { -- To view, visit https://gerrit.wikimedia.org/r/314831 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8dd1c863b6b5ac1826e236f0cc64b785fccbf3a5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Bootstrap Gerrit-Branch: master Gerrit-Owner: Foxtrott <s7ep...@gmail.com> Gerrit-Reviewer: Foxtrott <s7ep...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits