Commit Graph

277 Commits

Author SHA1 Message Date
Owen Mehegan 856ae9a9f7 Merge pull request #134 from thommy101/CommitStatus
Fixes for pullrequest #127
2015-11-19 11:26:42 -08:00
Tom E 7a7937130f Fix Readme.md missing return 2015-11-14 14:55:21 +01:00
Tom Elfring 17b451b685 Fix incorrect CommitStatus status value 2015-11-14 14:41:43 +01:00
Owen Mehegan 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
Owen Mehegan 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
Tom 5c57212288 Add readme for 8.1 CI features 2015-11-10 09:22:28 +01:00
Tom 51de2879fe Updated java-gitlab-api dependency to 1.1.11 2015-11-09 19:29:33 +01:00
Owen Mehegan 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
Owen Mehegan b650d88d45 Merge pull request #124 from jsyrjala/auto-accept-merge-request-default
Fix acceptMergeRequestOnSuccess configuration. Thanks!
2015-11-02 17:26:24 -08:00
Tom 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
Tom edd0e7f586 Added missing getter 2015-10-29 13:40:39 +01:00
Tom 9c6f635710 Added support for the GitLab 8.1 commit API 2015-10-28 20:30:11 +01:00
Juha Syrjälä 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
Juha Syrjälä 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
bassrock 3634056eb9 Updating bass rock username 2015-10-12 20:54:07 -07:00
Daniel Brooks 64b7eeda78 [maven-release-plugin] prepare for next development iteration 2015-10-12 20:51:35 -07:00
Daniel Brooks 0b7ffd0e54 [maven-release-plugin] prepare release gitlab-plugin-1.1.27 2015-10-12 20:51:30 -07:00
Daniel Brooks 09329d5725 Updating readme and changelog 2015-10-12 20:49:57 -07:00
bassrock 9c70f2eea2 Merge pull request #118 from christ66/intellij
Add excludes for Intellij ide.
2015-10-12 20:38:39 -07:00
bassrock 25cf40b6c3 Merge pull request #117 from christ66/ballColor
Replace ball color with result.
2015-10-12 17:48:34 -07:00
christ66 464cd6d522 Ignore intellij files. 2015-10-12 17:39:25 -07:00
christ66 7270f21203 Replace ball color with result. 2015-10-12 17:37:00 -07:00
bassrock d966f9d5ff Merge pull request #110 from kasper-f/acceptMergeRequestOnSuccess
Accept merge request on build success
2015-10-11 22:23:32 -07:00
bassrock 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
bassrock 5715e667ab Merge pull request #106 from xathien/master
Fix NPE on Gitlab push event
2015-10-11 22:22:10 -07:00
Kasper Fock 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
Kasper Fock 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
Kasper Fock 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
Kasper Fock 4ad29cad6e Updated dependency of java-gitlab-api to version 1.1.9 2015-09-18 13:05:08 +02:00
Zack 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
Jon Rosenberger d097c2d670 JENKINS-28271 - Gitlab Plugin does not build Merge Request when first raised. 2015-09-01 20:26:50 -05:00
Daniel Brooks 305a75696c [maven-release-plugin] prepare for next development iteration 2015-08-26 11:58:57 -07:00
Daniel Brooks 7fd26232ef [maven-release-plugin] prepare release gitlab-plugin-1.1.26 2015-08-26 11:58:54 -07:00
bassrock ad051af57f Merge pull request #101 from sudssm/cache_branches
Improvements to branch filtering
2015-08-26 11:56:53 -07:00
Sudarshan Muralidhar 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
bassrock 71f9728ace Merge pull request #103 from TomAndrews/mr-ci-skip
Generalise ci-skip to merge requests
2015-08-26 10:46:29 -07:00
Tom Andrews cd6e2df63f Generalise ci-skip to merge requests
Won't build or re-build a merge request which has "[ci-skip]" in the
description.
2015-08-26 18:37:36 +01:00
bassrock 019d82087a Merge pull request #102 from TomAndrews/configurable-rebuild
Configurable rebuild options
2015-08-26 10:31:51 -07:00
bassrock 45c34ad875 Merge pull request #100 from sudssm/workflow-support
add support for workflow projects
2015-08-26 10:30:30 -07:00
Sudarshan Muralidhar 123186933a minor cleanup 2015-08-20 16:10:29 -07:00
Sudarshan Muralidhar f25d906279 fix autocomplete to only show matching suggestions 2015-08-19 17:56:59 -07:00
Sudarshan Muralidhar ea81a54210 add support for workflow projects 2015-08-19 17:23:14 -07:00
Tom Andrews 7f8f9f861e Build all the affected merge requests.
It was returning after triggering one
2015-08-19 13:41:46 +01:00
Tom Andrews 42283655f6 Fix NPE
getDesc.project returns null
2015-08-19 13:41:46 +01:00
Tom Andrews 6a92c436c1 Don't build on merge trigger if action = update 2015-08-19 13:41:45 +01:00
Tom Andrews 721fcfdbf8 Allow choice of when to rebuild open merge requests
Never, on push to source branch, or on push to source or target branch.
2015-08-19 13:41:36 +01:00
Sudarshan Muralidhar 4a4ee6733e cache project branches for each job 2015-08-17 17:36:26 -07:00
Daniel Brooks 064ce0359b [maven-release-plugin] prepare for next development iteration 2015-07-31 10:34:47 -07:00
Daniel Brooks e02a035332 [maven-release-plugin] prepare release gitlab-plugin-1.1.25 2015-07-31 10:34:43 -07:00
bassrock 25d369fa81 Merge pull request #27 from FrantaM/allowed_branches
Changed allowed branches from fixed select to free form textbox.
2015-07-30 19:16:03 -07:00