Mirko Friedenhagen
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
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
bassrock
0cc6b94627
Merge pull request #94 from jet47/rebuild-open-mrs-target-branch
...
Rebuild open merge requests if target branch changed too
2015-07-30 19:14:50 -07:00
bassrock
484c3256ee
Merge pull request #93 from jet47/fix-null-access
...
Fix potential NULL pointer access in generateMergeRequestBuild
2015-07-30 19:14:32 -07:00
Vladislav Vinogradov
53263f38ee
rebuild open merge requests if target branch changed too
...
it makes sence, since changes in target branch might affect build status
after merge
2015-07-15 15:48:48 +03:00
Vladislav Vinogradov
2915e6612b
fix potential NULL pointer access in generateMergeRequestBuild
...
it fixes JENKINS-28271
2015-07-15 12:11:06 +03:00
Franta Mejta
4eaf7cabe6
Changed allowed branches from fixed select to free form textbox
2015-06-22 12:57:19 +02:00
Daniel Brooks
b781d1f768
[maven-release-plugin] prepare for next development iteration
2015-05-26 09:31:50 -07:00
Daniel Brooks
cb7bb8b846
[maven-release-plugin] prepare release gitlab-plugin-1.1.24
2015-05-26 09:31:47 -07:00
bassrock
b748eafe05
Merge pull request #83 from sullb/gitlabci-action-envVar
...
Gitlab action type env var
2015-05-26 09:21:03 -07:00
Mr Brian Sullivan
8c1f918d2e
Clarifying that the newly added gitlabActionType environment variable is optional and the possible values that would be provided by this plugin
2015-05-27 00:32:34 +10:00
Mr Brian Sullivan
285f9cc982
Adding new paramater under Parameterized builds
2015-05-26 07:09:58 +10:00
Mr Brian Sullivan
2aa00da7b9
Adding new environment variable to indicate if trigger was due to PUSH or MERGE
2015-05-25 06:41:44 +10:00
bassrock
212ceeeaeb
Merge pull request #80 from djsipe/updated_readme
...
Updated readme
2015-05-07 14:49:28 -07:00
DJ Sipe
305e67d8c2
Minor update to README
2015-05-07 16:22:32 -04:00