2f74e58d43
[maven-release-plugin] prepare for next development iteration
2015-11-19 12:16:50 -08:00
bf5ecd99b1
[maven-release-plugin] prepare release gitlab-plugin-1.1.28
2015-11-19 12:16:47 -08:00
567b5ede30
Merge pull request #119 from mfriedenhagen/add-jenkins-build-url-to-votes
...
Add buildUrl in the description of the merge message.
2015-11-19 11:41:03 -08:00
030abfb4a7
Merge pull request #135 from markus-mnm/#126-Handle_NPE_on_push_requests
...
#126 handle npe on push requests
2015-11-19 11:39:17 -08:00
766e1c300d
Merge pull request #133 from EmteZogaf/132-sent-mr-commit-build-status-on-push-event
...
Sent commit status on push triggered mr build
2015-11-19 11:27:32 -08:00
856ae9a9f7
Merge pull request #134 from thommy101/CommitStatus
...
Fixes for pullrequest #127
2015-11-19 11:26:42 -08:00
6869b5f226
add test samples for different gitlab server ver.
...
The tests are only covering createPushRequestRevisionParameter at this
stage.
Only samples for these servers exist at this stage.
- Gitlab Server 7.5.1 36679b5
- Gitlab Server 7.10.5 489b413
- Gitlab Server 8.1.2 8c8af7b
[gitlab-plugin-126]
2015-11-15 12:40:37 +11:00
b4899a1f75
fallback to after sha on null checkout sha
...
[FIXED gitlab-plugin-126]
2015-11-15 12:39:59 +11:00
7a7937130f
Fix Readme.md missing return
2015-11-14 14:55:21 +01:00
17b451b685
Fix incorrect CommitStatus status value
2015-11-14 14:41:43 +01:00
2c9e47398e
Merge remote-tracking branch 'upstream/master'
2015-11-14 14:05:41 +02:00
9f9221d5b1
Sent commit status on push triggered mr build
...
When a merge request build is being scheduled because of a push event
get the commit sha of the source branch being merged and set the
last_commit property of the merge request object in order to be able to
send the status of the build on completion.
Fixes #132
2015-11-13 01:06:08 +01:00
113a759607
Merge pull request #127 from thommy101/#111-Commit_API
...
Added support for the GitLab 8.1 commit API
2015-11-11 13:25:28 -08:00
e47e81cbcb
Tweak job config UI to make it more clear that 'filter branches' option is part of the GitLab config
2015-11-10 16:12:04 -08:00
5c57212288
Add readme for 8.1 CI features
2015-11-10 09:22:28 +01:00
51de2879fe
Updated java-gitlab-api dependency to 1.1.11
2015-11-09 19:29:33 +01:00
fb86fd4404
Update README with call for maintainer help, list of supported and unsupported GitLab versions, and other minor edits.
2015-11-05 17:19:45 -08:00
a0ba613fa3
Merge branch 'master' of github.com:illay1994/gitlab-plugin
2015-11-05 10:37:58 +02:00
58af7ef453
Add two variable gitlabUserName and gitlabUserEmail in MergeRequest
...
and resolve JENKINS-30874
2015-11-05 10:37:29 +02:00
7d7b476eee
Add two variable gitlabUserName and gitlabUserEmail in MergeRequest
2015-11-05 10:35:34 +02:00
40ade72231
Add two variable gitlabUserName and gitlabUserEmail
2015-11-04 18:43:05 +02:00
b650d88d45
Merge pull request #124 from jsyrjala/auto-accept-merge-request-default
...
Fix acceptMergeRequestOnSuccess configuration. Thanks!
2015-11-02 17:26:24 -08:00
7b8a85c044
Fix wrong URL being send to Gitlab
...
Also a fix for MergeRequests containing source branch instead of commit
hash
2015-10-30 20:03:26 +01:00
edd0e7f586
Added missing getter
2015-10-29 13:40:39 +01:00
9c6f635710
Added support for the GitLab 8.1 commit API
2015-10-28 20:30:11 +01:00
f933c79b17
Make Accept merge request on success to default to false.
...
Accepting automatically merge requests when jenkins job is
successful is not that common workflow. Also manually fixing missed merge
request acception is easier than fixing unintended merge request.
https://en.wikipedia.org/wiki/Principle_of_least_astonishment
2015-10-24 20:01:32 +03:00
944ddd5cfb
Add missing getter for acceptMergeRequestOnSuccess.
...
It seems that jenkins doesn't update checkbox status if getter is missing.
Fixes #120 and https://issues.jenkins-ci.org/browse/JENKINS-31122
2015-10-24 18:35:00 +03:00
1f397106f9
Add buildUrl in the description of the merge message.
...
When you have more than one project which takes part in a merge request,
it would be feasible to see directly which job voted in favor or not
for the merge request. So add it it directly in the visible output.
2015-10-14 21:33:22 +02:00
3634056eb9
Updating bass rock username
2015-10-12 20:54:07 -07:00
64b7eeda78
[maven-release-plugin] prepare for next development iteration
2015-10-12 20:51:35 -07:00
0b7ffd0e54
[maven-release-plugin] prepare release gitlab-plugin-1.1.27
2015-10-12 20:51:30 -07:00
09329d5725
Updating readme and changelog
2015-10-12 20:49:57 -07:00
9c70f2eea2
Merge pull request #118 from christ66/intellij
...
Add excludes for Intellij ide.
2015-10-12 20:38:39 -07:00
25cf40b6c3
Merge pull request #117 from christ66/ballColor
...
Replace ball color with result.
2015-10-12 17:48:34 -07:00
464cd6d522
Ignore intellij files.
2015-10-12 17:39:25 -07:00
7270f21203
Replace ball color with result.
2015-10-12 17:37:00 -07:00
d966f9d5ff
Merge pull request #110 from kasper-f/acceptMergeRequestOnSuccess
...
Accept merge request on build success
2015-10-11 22:23:32 -07:00
9d8dab634c
Merge pull request #105 from jr4/JENKINS-28271
...
JENKINS-28271 - Gitlab Plugin does not build Merge Request when first raised
2015-10-11 22:22:43 -07:00
5715e667ab
Merge pull request #106 from xathien/master
...
Fix NPE on Gitlab push event
2015-10-11 22:22:10 -07:00
3e462e6d91
Merged with master branch and corrected merge issues with the accept merge request on build success feature
2015-09-18 15:23:24 +02:00
5bb1a00b05
Merge remote-tracking branch 'parent/master' into acceptMergeRequestOnSuccess
...
Conflicts:
src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java
src/main/resources/com/dabsquared/gitlabjenkins/GitLabPushTrigger/config.jelly
2015-09-18 13:38:39 +02:00
a38fc7397c
Merge remote-tracking branch 'parent/master' into acceptMergeRequestOnSuccess
...
Conflicts:
src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java
src/main/resources/com/dabsquared/gitlabjenkins/GitLabPushTrigger/config.jelly
2015-09-18 13:10:36 +02:00
4ad29cad6e
Updated dependency of java-gitlab-api to version 1.1.9
2015-09-18 13:05:08 +02:00
4954d9a08f
Fix NPE on Gitlab push event
...
Caused by: java.lang.NullPointerException
at com.google.common.base.Preconditions.checkNotNull(Preconditions.java:187)
at com.google.common.base.Splitter.split(Splitter.java:371)
at com.dabsquared.gitlabjenkins.GitLabPushTrigger$DescriptorImpl.splitBranchSpec(GitLabPushTrigger.java:630)
at com.dabsquared.gitlabjenkins.GitLabPushTrigger$DescriptorImpl.access$000(GitLabPushTrigger.java:499)
at com.dabsquared.gitlabjenkins.GitLabPushTrigger.isBranchAllowed(GitLabPushTrigger.java:137)
at com.dabsquared.gitlabjenkins.GitLabPushTrigger.onPost(GitLabPushTrigger.java:176)
at com.dabsquared.gitlabjenkins.GitLabWebHook.generatePushBuild(GitLabWebHook.java:400)
at com.dabsquared.gitlabjenkins.GitLabWebHook.generateBuild(GitLabWebHook.java:360)
at com.dabsquared.gitlabjenkins.GitLabWebHook.getDynamic(GitLabWebHook.java:157)
2015-09-10 10:59:49 -06:00
d097c2d670
JENKINS-28271 - Gitlab Plugin does not build Merge Request when first raised.
2015-09-01 20:26:50 -05:00
305a75696c
[maven-release-plugin] prepare for next development iteration
2015-08-26 11:58:57 -07:00
7fd26232ef
[maven-release-plugin] prepare release gitlab-plugin-1.1.26
2015-08-26 11:58:54 -07:00
ad051af57f
Merge pull request #101 from sudssm/cache_branches
...
Improvements to branch filtering
2015-08-26 11:56:53 -07:00
67107806f7
Merge branch 'master' of https://github.com/DABSquared/gitlab-plugin into cache_branches
...
Conflicts:
src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java
2015-08-26 14:49:56 -07:00
71f9728ace
Merge pull request #103 from TomAndrews/mr-ci-skip
...
Generalise ci-skip to merge requests
2015-08-26 10:46:29 -07:00
Owen Mehegan