diff --git a/README.md b/README.md index b1932d9..98e75a2 100644 --- a/README.md +++ b/README.md @@ -294,13 +294,13 @@ In order to build when a new tag is pushed: * In the ``GitLab server`` add ``Tag push events`` to the ``Web Hook`` * In the ``Jenkins`` under the ``Source Code Management`` section: * select ``Advance...`` and add ``+refs/tags/*:refs/remotes/origin/tags/*`` as ``Refspec`` - * you can also use ``Branch Specifier`` to specify which tag need to be built (exampple ``refs/tags/${TAGNAME}``) + * you can also use ``Branch Specifier`` to specify which tag need to be built (example ``refs/tags/${TAGNAME}``) # Send message on complete of a build 1. In the *Post build steps* section: 1. Click *Add post build step* - 2. Click *Add note with build status on GitLab merge requests* and save build settings (You enabled autoumatically sending default message on result of a build) + 2. Click *Add note with build status on GitLab merge requests* and save build settings (You enabled automatically sending default message on result of a build) 2. If you want make custom message on result of a build: 1. In *Add note with build status on GitLab merge requests* section click to *Custom message on success/failure/abort* diff --git a/src/docker/README.md b/src/docker/README.md index 54ba429..29fecb2 100644 --- a/src/docker/README.md +++ b/src/docker/README.md @@ -4,7 +4,7 @@ In order to test the plugin on different versions of `GitLab` and `Jenkins` you A example docker-compose file is available at `gitlab-plugin/src/docker` which allows to set up instances of the latest `GitLab` and `Jenkins` versions. -If they don't already exist, create the following directories and make sure the user that Docker is runnning as owns them: +If they don't already exist, create the following directories and make sure the user that Docker is running as owns them: * /srv/docker/gitlab/postgresql * /srv/docker/gitlab/gitlab * /srv/docker/gitlab/redis diff --git a/src/test/java/com/dabsquared/gitlabjenkins/publisher/GitLabCommitStatusPublisherTest.java b/src/test/java/com/dabsquared/gitlabjenkins/publisher/GitLabCommitStatusPublisherTest.java index 8b32ec0..04839a4 100644 --- a/src/test/java/com/dabsquared/gitlabjenkins/publisher/GitLabCommitStatusPublisherTest.java +++ b/src/test/java/com/dabsquared/gitlabjenkins/publisher/GitLabCommitStatusPublisherTest.java @@ -420,11 +420,11 @@ public class GitLabCommitStatusPublisherTest { return build; } - private String getSingleProjectJson(String name,String projectNameWithNamespace, int porjectId) throws IOException { + private String getSingleProjectJson(String name,String projectNameWithNamespace, int projectId) throws IOException { String nameSpace = projectNameWithNamespace.split("/")[0]; String projectName = projectNameWithNamespace.split("/")[1]; return IOUtils.toString(getClass().getResourceAsStream(name)) - .replace("${projectId}", porjectId + "") + .replace("${projectId}", projectId + "") .replace("${nameSpace}", nameSpace) .replace("${projectName}", projectName); }