Skip to content

Commit

Permalink
spelling: GitHub (#1883)
Browse files Browse the repository at this point in the history
  • Loading branch information
jsoref authored and olamy committed Dec 1, 2018
1 parent 4798232 commit 6eebd83
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion blueocean-dashboard/src/main/js/creation/ScmProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

/**
* Models a SCM Provider (e.g. Git, Github, Github Enterprise) used in 'Create Pipeline' flow.
* Models a SCM Provider (e.g. Git, Github, GitHub Enterprise) used in 'Create Pipeline' flow.
* Extend this class and implement methods to provide an implementation.
*/
export default class ScmProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,12 @@ creation.githubent.add_server.text_name_placeholder=\u6211\u7684 GitHub \u670D\u
creation.githubent.add_server.text_name_title=\u670D\u52A1\u540D
#URL\u5DF2\u7ECF\u88AB\u5176\u4ED6\u670D\u52A1\u4F7F\u7528
creation.githubent.add_server.text_url_error_duplicate=URL \u5DF2\u7ECF\u88AB\u5176\u4ED6\u670D\u52A1\u4F7F\u7528
creation.githubent.add_server.text_url_error_invalid=\u65E0\u6CD5\u8FDE\u63A5\u5230\u53EF\u7528\u7684 Github \u670D\u52A1\u5668
creation.githubent.add_server.text_url_error_invalid=\u65E0\u6CD5\u8FDE\u63A5\u5230\u53EF\u7528\u7684 GitHub \u670D\u52A1\u5668
#\u8BF7\u8F93\u5165\u6709\u6548\u7684URL.
creation.githubent.add_server.text_url_error_required=\u8BF7\u8F93\u5165\u6709\u6548\u7684 URL
creation.githubent.add_server.text_url_placeholder=https://github.example.com
creation.githubent.add_server.text_url_title=\u670D\u52A1\u5730\u5740
creation.githubent.add_server.title=\u6DFB\u52A0 Github \u670D\u52A1\u5668
creation.githubent.add_server.title=\u6DFB\u52A0 GitHub \u670D\u52A1\u5668
## github enterprise \u521B\u5EFA\u6D41\u7A0B
#\u6DFB\u52A0
creation.githubent.choose_server.button_add=\u6DFB\u52A0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public GithubPipelineCreateRequest(String name, BlueScmConfig scmConfig) {

@Override
protected SCMSource createSource(@Nonnull MultiBranchProject project, @Nonnull BlueScmConfig scmConfig) {
// Update endpoint only if its Github Enterprise
// Update endpoint only if its GitHub Enterprise
if(scmConfig.getId().equals(GithubEnterpriseScm.ID)) {
updateEndpoints(scmConfig.getUri());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@ public Iterator<ScmOrganization> iterator() {
HttpException ex = (HttpException) e;
if (ex.getResponseCode() == 401) {
throw new ServiceException
.PreconditionRequired("Invalid Github accessToken", ex);
.PreconditionRequired("Invalid GitHub accessToken", ex);
}else if(ex.getResponseCode() == 403){
throw new ServiceException
.PreconditionRequired("Github accessToken does not have required scopes. Expected scopes 'user:email, repo'", ex);
.PreconditionRequired("GitHub accessToken does not have required scopes. Expected scopes 'user:email, repo'", ex);
}
}
throw new ServiceException.UnexpectedErrorException(e.getMessage(), e);
Expand Down Expand Up @@ -304,13 +304,13 @@ protected static HttpURLConnection connect(String apiUrl, String accessToken) th
throw new ServiceException.PreconditionRequired("Invalid accessToken");
}
if(status == 403){
throw new ServiceException.PreconditionRequired("Github accessToken does not have required scopes. Expected scopes 'user:email, repo'");
throw new ServiceException.PreconditionRequired("GitHub accessToken does not have required scopes. Expected scopes 'user:email, repo'");
}
if(status == 404){
throw new ServiceException.NotFoundException(String.format("Remote server at %s responded with code 404.", apiUrl));
}
if(status != 200) {
throw new ServiceException.BadRequestException(String.format("Github Api returned error: %s. Error message: %s.", connection.getResponseCode(), connection.getResponseMessage()));
throw new ServiceException.BadRequestException(String.format("GitHub Api returned error: %s. Error message: %s.", connection.getResponseCode(), connection.getResponseMessage()));
}

return connection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import java.util.Map;

/**
* Github SCM save file API
* GitHub SCM save file API
*
* @author Vivek Pandey
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public class GithubServerContainer extends ScmServerEndpointContainer {
}

if (StringUtils.isNotEmpty(url)) {
// Validate that the URL represents a Github API endpoint
// Validate that the URL represents a GitHub API endpoint
try {
HttpURLConnection connection = HttpRequest.get(url).connect();

Expand Down Expand Up @@ -136,7 +136,7 @@ public class GithubServerContainer extends ScmServerEndpointContainer {
}
}
}
ErrorMessage message = new ErrorMessage(400, "Failed to create Github server");
ErrorMessage message = new ErrorMessage(400, "Failed to create GitHub server");
message.addAll(errors);
throw new ServiceException.BadRequestException(message);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,19 +272,19 @@ public void shouldFindUserStoreCredential() throws IOException {

assertNotNull(store);
store.addDomain(new Domain("github-domain",
"Github Domain to store personal access token",
"GitHub Domain to store personal access token",
Collections.<DomainSpecification>singletonList(new BlueOceanDomainSpecification())));


Domain domain = store.getDomainByName("github-domain");
StandardUsernamePasswordCredentials credential = new UsernamePasswordCredentialsImpl(CredentialsScope.USER,
"github", "Github Access Token", user.getId(), "12345");
"github", "GitHub Access Token", user.getId(), "12345");
store.addCredentials(domain, credential);

//create another credentials with same id in system store with different description
for(CredentialsStore s: CredentialsProvider.lookupStores(Jenkins.getInstance())){
s.addCredentials(Domain.global(), new UsernamePasswordCredentialsImpl(CredentialsScope.USER,
"github", "System Github Access Token", user.getId(), "12345"));
"github", "System GitHub Access Token", user.getId(), "12345"));
}

WorkflowMultiBranchProject mp = j.jenkins.createProject(WorkflowMultiBranchProject.class, "demo");
Expand All @@ -295,7 +295,7 @@ public void shouldFindUserStoreCredential() throws IOException {

// lookup for created credential id in system store, it should resolve to previously created user store credential
StandardCredentials c = Connector.lookupScanCredentials((Item)mp, "https://api.github.com", credential.getId());
assertEquals("Github Access Token", c.getDescription());
assertEquals("GitHub Access Token", c.getDescription());

assertNotNull(c);
assertTrue(c instanceof StandardUsernamePasswordCredentials);
Expand All @@ -314,7 +314,7 @@ public void shouldFindUserStoreCredential() throws IOException {

//it must resolve to system credential
c = Connector.lookupScanCredentials((Item)mp, null, credential.getId());
assertEquals("System Github Access Token", c.getDescription());
assertEquals("System GitHub Access Token", c.getDescription());
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion licenses/octicons-license.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Github Octicons
GitHub Octicons

(c) 2012-2016 GitHub

Expand Down

0 comments on commit 6eebd83

Please sign in to comment.