diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2016-10-09 21:56:13 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-09 21:56:13 +0300 |
commit | e3b25042e578ec96016d0cd08fafabc270eabdf6 (patch) | |
tree | 118068dce6a13940c33950dc716ead20e99988f2 | |
parent | e4211b26d7108f045c5d01484c5aa8e4e3e8960b (diff) | |
parent | 7359c3721edff57cecfafab5edc67a530e090659 (diff) |
Merge pull request #10713 from lipis/GitHub
Fixed GitHub case
-rw-r--r-- | plugins/LanguagesManager/Commands/CreatePull.php | 2 | ||||
-rw-r--r-- | plugins/TestRunner/Commands/GenerateTravisYmlFile.php | 4 | ||||
-rw-r--r-- | tests/lib/mocha-3.1.0/CHANGELOG.md | 2 | ||||
-rw-r--r-- | tests/lib/mocha-3.1.0/bin/_mocha | 2 | ||||
-rw-r--r-- | tests/lib/q-1.4.1/CHANGES.md | 2 | ||||
-rw-r--r-- | tests/lib/screenshot-testing/support/app.js | 2 | ||||
-rw-r--r-- | tests/lib/screenshot-testing/support/diff-viewer.js | 4 |
7 files changed, 9 insertions, 9 deletions
diff --git a/plugins/LanguagesManager/Commands/CreatePull.php b/plugins/LanguagesManager/Commands/CreatePull.php index bfac18566d..0af07259ff 100644 --- a/plugins/LanguagesManager/Commands/CreatePull.php +++ b/plugins/LanguagesManager/Commands/CreatePull.php @@ -187,7 +187,7 @@ class CreatePull extends TranslationBase while (true) { - $username = $dialog->ask($output, 'Please provide your github username (to create a pull request using Github API): '); + $username = $dialog->ask($output, 'Please provide your GitHub username (to create a pull request using GitHub API): '); $returnCode = shell_exec('curl \ -X POST \ diff --git a/plugins/TestRunner/Commands/GenerateTravisYmlFile.php b/plugins/TestRunner/Commands/GenerateTravisYmlFile.php index a99c3ae4f0..dfb2d366cd 100644 --- a/plugins/TestRunner/Commands/GenerateTravisYmlFile.php +++ b/plugins/TestRunner/Commands/GenerateTravisYmlFile.php @@ -33,7 +33,7 @@ class GenerateTravisYmlFile extends ConsoleCommand ->addOption('artifacts-pass', null, InputOption::VALUE_REQUIRED, "Password to the Piwik build artifacts server. Will be encrypted in the .travis.yml file.") ->addOption('github-token', null, InputOption::VALUE_REQUIRED, - "Github token of a user w/ push access to this repository. Used to auto-commit updates to the " + "GitHub token of a user w/ push access to this repository. Used to auto-commit updates to the " . ".travis.yml file and checkout dependencies. Will be encrypted in the .travis.yml file.\n\n" . "If not supplied, the .travis.yml will fail the build if it needs updating.") ->addOption('php-versions', null, InputOption::VALUE_OPTIONAL, @@ -70,4 +70,4 @@ class GenerateTravisYmlFile extends ConsoleCommand return $returnCode; } -}
\ No newline at end of file +} diff --git a/tests/lib/mocha-3.1.0/CHANGELOG.md b/tests/lib/mocha-3.1.0/CHANGELOG.md index 0e70bec01c..27d04fac00 100644 --- a/tests/lib/mocha-3.1.0/CHANGELOG.md +++ b/tests/lib/mocha-3.1.0/CHANGELOG.md @@ -1113,7 +1113,7 @@ Thanks @entertainyou, @SimenB, @just-paja for the heads-up. * Added js API. Closes #265 * Added: initial run of tests with `--watch`. Closes #345 * Added: mark `location` as a global on the CS. Closes #311 - * Added `markdown` reporter (github flavour) + * Added `markdown` reporter (GitHub flavour) * Added: scrolling menu to coverage.html. Closes #335 * Added source line to html report for Safari [Tyson Tate] * Added "min" reporter, useful for `--watch` [Jakub Nešetřil] diff --git a/tests/lib/mocha-3.1.0/bin/_mocha b/tests/lib/mocha-3.1.0/bin/_mocha index b355e28352..1d3539e8f0 100644 --- a/tests/lib/mocha-3.1.0/bin/_mocha +++ b/tests/lib/mocha-3.1.0/bin/_mocha @@ -148,7 +148,7 @@ program.on('reporters', function() { console.log(' xunit - xunit reporter'); console.log(' min - minimal reporter (great with --watch)'); console.log(' json-stream - newline delimited json events'); - console.log(' markdown - markdown documentation (github flavour)'); + console.log(' markdown - markdown documentation (GitHub flavour)'); console.log(' nyan - nyan cat!'); console.log(); process.exit(); diff --git a/tests/lib/q-1.4.1/CHANGES.md b/tests/lib/q-1.4.1/CHANGES.md index cd351fdb85..eb60b0d7af 100644 --- a/tests/lib/q-1.4.1/CHANGES.md +++ b/tests/lib/q-1.4.1/CHANGES.md @@ -655,7 +655,7 @@ Their replacements are listed here: - Fixed a minor bug in thenable assimilation, regressed because of the change in the forwarding protocol. - Fixed behavior of "q/util" `deep` method on dates and - other primitives. Github issue #11. + other primitives. GitHub issue #11. ## 0.2.6 diff --git a/tests/lib/screenshot-testing/support/app.js b/tests/lib/screenshot-testing/support/app.js index 85a3ec7a0c..42115a8d79 100644 --- a/tests/lib/screenshot-testing/support/app.js +++ b/tests/lib/screenshot-testing/support/app.js @@ -63,7 +63,7 @@ Application.prototype.printHelpAndExit = function () { console.log(" the tests are in another plugin. For use with travis build."); console.log(" --assume-artifacts: Assume the diffviewer and processed screenshots will be stored on the."); console.log(" builds artifacts server. For use with travis build."); - console.log(" --screenshot-repo: Specifies the github repository that contains the expected screenshots"); + console.log(" --screenshot-repo: Specifies the GitHub repository that contains the expected screenshots"); console.log(" to link to in the diffviewer. For use with travis build."); console.log(" --core: Only execute UI tests that are for Piwik core or Piwik core plugins."); console.log(" --first-half: Only execute first half of all the test suites. Will be only applied if no") diff --git a/tests/lib/screenshot-testing/support/diff-viewer.js b/tests/lib/screenshot-testing/support/diff-viewer.js index a3fc42d9b7..92180e4730 100644 --- a/tests/lib/screenshot-testing/support/diff-viewer.js +++ b/tests/lib/screenshot-testing/support/diff-viewer.js @@ -70,7 +70,7 @@ DiffViewerGenerator.prototype.generate = function (callback) { } expectedHtml += '<a href="' + expectedUrl + '">Expected</a> '; - githubUrl = '<a href="' + expectedUrlGithub + '">Github</a>'; + githubUrl = '<a href="' + expectedUrlGithub + '">GitHub</a>'; } else { var expectedHtml = '<em>Not found</em>'; } @@ -123,4 +123,4 @@ DiffViewerGenerator.prototype.generate = function (callback) { callback(); }; -exports.DiffViewerGenerator = DiffViewerGenerator;
\ No newline at end of file +exports.DiffViewerGenerator = DiffViewerGenerator; |