Commit Graph

462 Commits

Author SHA1 Message Date
sh0ked f076d397f9 added-trigger-by-note-events 2016-06-20 18:39:41 +06:00
Robin Müller a5c87853e0 Add possibility to enable authentication for the /project end-point (Fixes #282) 2016-06-16 20:56:29 +02:00
Robin Müller 090fa9a546 Update credentials-plugin to version 2.1.0 (JENKINS-35538) 2016-06-14 22:17:39 +02:00
Robin Müller 77cd938220 Fix NPE when no build data found (Fixes #357) 2016-06-14 21:37:14 +02:00
Oscar Salvador Morillo Victoria 165d01e07b add more logging output 2016-06-12 14:16:37 +02:00
Oscar Salvador Morillo Victoria 6875224788 Fix NPE when no build data found 2016-06-12 14:16:37 +02:00
Csaba Kozak ef4f774d02 Fix NPE when updating commit status
If there was no commit for the last build because the
pushed commit no longer exists, a NPE could occur.
2016-06-09 15:44:07 +02:00
Robin Müller 3f92edbd22 Add possibility to configure the timeouts for GitLabConnections (fixes #342) 2016-06-07 21:06:30 +02:00
Robin Müller 32ed183624 Catch also ProcessingExceptions while using the GitLab client 2016-06-07 20:11:53 +02:00
Robin Müller 10226d9c53 Change order of steps add note and accept MR
- adding the jenkins build status note before accepting the MR makes more sense
2016-06-07 20:07:52 +02:00
Kristoffer Erlandsson d5752a70e0 More tests and refactoring of ActionResolver.onPost 2016-05-26 10:48:04 +02:00
Owen Mehegan 821cb3fd0e Merge pull request #322 from xinranxiao/project_field_compatibility
Git push hook namespace compatibility for Gitlab pre ~v8.5
2016-05-25 13:16:57 -07:00
omorillo d8639a94c7 Merge pull request #281 from kerlandsson/tag-event-fix
Fix: Builds not be triggered on tag push events
2016-05-25 20:50:43 +02:00
Oscar Salvador Morillo Victoria c27af27332 Fixes #319: Wrong username in Jenkins build description on push event
The build description is expected to provide information
about the user who triggered a build job.
Previously, the therein specified user was the committer who
most recently committed to that pushed branch. However,
this does not necessarily correspond to the GitLab user
who actually triggered the build job by pushing the changeset.
The existing behaviour was replaced to use the GitLab user
instead unless provided through the GitLab request and to
fall back to the most recent committer if the GitLab user
is not available.
2016-05-24 23:25:29 +02:00
Oscar Salvador Morillo Victoria d28dc626a6 mark unused function to be removed 2016-05-24 23:25:29 +02:00
Oscar Salvador Morillo Victoria 477ab67cd5 tiny improvements 2016-05-24 23:25:29 +02:00
Konstantin Bulanov fad9c5cfcd Fix to support NameSpace or ProjectName with dot in it
According to Rails documentation(http://guides.rubyonrails.org/v3.1.3/routing.html section 3.2 Dynamic Segments) Rail use a dot as separator for formatted routes.
In this case if we have dot in ProjectId constructed from(namespace + projectname) all request except getSingleProject(http://docs.gitlab.com/ce/api/projects.html#get-single-project) fail with message
"Failed to update Gitlab commit status for project Name.Test/Repo': HTTP 500 Internal Server Error"

To support This case we check if projectId have dot inside of it
if it has execute getSingleProject request and extract Integer projectId to operate with
if it hasn't use prepared projectId(Namespace + ProjectName)
2016-05-20 10:46:34 +04:00
Robin Müller 6e2de7c63d Merge pull request #311 from team-supercharge/fix-commit-status
Fix finding related commit of the build
2016-05-19 20:46:03 +02:00
Xinran Xiao 89cbe2515d MR webhook compatibility 2016-05-18 11:09:04 -07:00
Xinran Xiao 88d0f92ad2 separate out compatibility step 2016-05-17 14:40:24 -07:00
Xinran Xiao d9a66ae5ba namespace compatibility for gitlab v7.14 for push hook parsing 2016-05-17 12:23:49 -07:00
Csaba Kozak b562c93c10 Fix finding related commit of the build 2016-05-13 17:22:39 +02:00
Csaba Kozak c3b1bc855e Fix setting MR IID
This caused the following incorrect build description:

 "GitLab ​Merge ​Request ​#null: ​repository/source=> ​target"
2016-05-11 18:31:21 +02:00
Kristoffer Erlandsson efe91a1870 Fixed issue where builds would not be triggered on tag push events 2016-05-11 14:36:35 +02:00
Robin Müller 32cd71c119 Use the character encoding of the request or UTF-8 if no character encoding is available for decoding the request body of a web hook (fixes #308) 2016-05-11 09:00:11 +02:00
Robin Müller 358b4f229f Merge pull request #304 from demaniak/safe-string-comparison
Utilizing SpringUtils to safely perform string comparison.
2016-05-10 12:35:05 +02:00
Robin Müller fb63a33763 Configure connection pooling and timeouts for the client 2016-05-10 09:51:02 +02:00
Robin Müller 99bde6fe1e Use ResteasyClientBuilder to configure ignoreCertificateErrors 2016-05-10 09:50:08 +02:00
HS Coetzee 89670f4726 Utilizing SpringUtils to safely perform string comparison.
When the X-Gitlab-Event header is not present (pre-7.14 versions of
GitLab), a NPE was raised here, thereby bypassing intended error
handling.
2016-05-09 18:05:25 +02:00
Robin Müller fcde6857ea Fix HTTP 404 error for the rebuild open MRs on push to target branch for forked repositories 2016-05-04 23:16:46 +02:00
Robin Müller 9656e73906 Add gitlabMergeRequestIid, gitlabSourceNamespace and gitlabTargetNamespace to CauseData and show the correct MR id within the build description (fixes #290, #246) 2016-05-04 23:14:29 +02:00
Robin Müller f6b7f6df11 Do not trigger a build for a remove branch push event (fixes #294) 2016-05-04 22:19:09 +02:00
Robin Müller 85f415fe1f Use HTTP GET instead of HEAD to check for the existence of a commit as workaround for RESTEASY-1347 2016-05-04 20:25:47 +02:00
Owen Mehegan 419f25d35a Merge pull request #283 from dslavets/patch-1
Send thumbs-down icon when the build fails.
2016-05-03 14:00:07 -07:00
Robin Müller 2aeb5d9b4b Use jenkins credentials-plugin for storing the GitLab API Token 2016-05-03 22:49:17 +02:00
Robin Müller 4d3bd9bf1a Clear clients cache if connection config has changed 2016-05-03 22:49:17 +02:00
dslavets 5c6a9cb4f5 result icon fix
send 👎 when the build fails
2016-05-02 18:45:52 +02:00
Robin Müller eb1abb2e2c Add workflow step that updates the GitLab commit status depending on the build status (fixes #262) 2016-04-30 14:50:22 +02:00
Robin Müller 912967e716 Replace the GitLabEnvironmentRunListener by an EnvironmentContributor 2016-04-29 13:05:42 -07:00
Robin Müller 545a690be8 Use Job and Run instead of AbstractProject and AbstractBuild wherever possible 2016-04-29 13:05:42 -07:00
Owen Mehegan d41040a64f sourceRepoHomepage and sourceRepoUrl are not sent for merge requests evens in GitLab 7.14 (fixes #273) 2016-04-28 22:56:54 +02:00
Robin Müller 6372b01ad2 Use GitLab MergeRequest notes API instead of comments API (fixes #275) 2016-04-28 22:34:44 +02:00
Robin Müller 99ea7c1a89 Expand environment variables in GitSCM remoteUrls while retrieving the projectId 2016-04-28 20:27:59 +02:00
Oscar Salvador Morillo Victoria d14f7d3c40 Fix: Merge request hook not set by addProjectHook function 2016-04-26 07:54:00 -07:00
Oscar Salvador Morillo Victoria 55e2894d9c Fix: rename variable name in GitLabApi 2016-04-26 07:53:53 -07:00
Oscar Salvador Morillo Victoria e7301a2288 GitLabApi: Extend by createMergeRequest function 2016-04-26 07:53:45 -07:00
Robin Müller 8f922c43b3 Add a log event if a build for a not allowed branch was triggered 2016-04-25 20:51:39 +02:00
Robin Müller 463998719c Add first integration test with dockerized GitLab environment 2016-03-23 23:39:49 +01:00
Robin Müller 61f5325d47 Run reformat code for whole project 2016-03-20 20:37:53 +01:00
Robin Müller b4bec70589 Make fields for BranchFilter and WebHookTriggerHandler transient and initialize them with readResolve in the GitLabPushTrigger 2016-03-20 18:06:24 +01:00
Robin Müller b869300f27 Replace Gson completely by Jackson 2016-03-20 17:36:46 +01:00
Robin Müller 112ba65dbb Use 2 separate packages for API models and hook models as they are too different 2016-03-20 17:09:41 +01:00
Robin Müller 108ad736c4 Convert the GitLab web hook data within the trigger handlers to the new CauseData
- this reduce the null checks so the API model classes can be simple POJOs again
2016-03-20 16:21:09 +01:00
Robin Müller c2a12d5e0e Add CauseData that holds all relevant information for a build triggered by GitLab 2016-03-20 16:10:17 +01:00
Robin Müller 95588c6fab Add unit tests 2016-03-19 17:40:36 +01:00
Robin Müller 796998e593 Use the new client 2016-03-19 17:36:12 +01:00
Robin Müller 81b3433351 Create client using resteasy 2016-03-19 17:36:02 +01:00
Robin Müller aa810139c7 Implement requierd methods of the GitLab API using jax-rs 2016-03-19 17:36:02 +01:00
Robin Müller d925fcf76a Move model classes to gitlab.api package 2016-03-19 00:13:30 +01:00
Robin Müller ed8d57c1a7 Add also for MR builds a RevisionParameterAction to force the build of the latest commit of the branch to merge 2016-03-18 22:03:51 +01:00
Robin Müller e9e13d5536 Move triggering of open MRs to the WebHookTriggerHandlers 2016-03-17 23:52:23 +01:00
Robin Müller 87615f6b6b Use branch name instead of commit hash for the ref parameter of the update commit status method 2016-03-16 22:45:23 +01:00
Robin Müller 99557ae38f Use guava Optional "getters" for all fields of the model classes 2016-03-16 21:11:53 +01:00
Robin Müller 6ed59cba06 Move migration of jobs to GitLabPushTrigger to remove deprecated getters 2016-03-15 21:34:34 +01:00
Robin Müller fab13af154 Remove obsolete class GitLab and its remaining usages 2016-03-15 21:34:34 +01:00
Robin Müller 29d38c2cfe Move code for the validation of the include and exclude branches specs to ProjectBranchProvider 2016-03-15 21:34:33 +01:00
Robin Müller a4723698ad Move code for retrieving branch auto completion candidates to ProjectBranchProvider 2016-03-15 21:34:33 +01:00
Robin Müller 2db8ef562e Move code for retrieving project branches to separate class 2016-03-15 21:34:33 +01:00
Robin Müller d6d4ad9786 Remove obsolete methods to retrieve the GitLabPushTrigger.DescriptorImpl 2016-03-15 21:34:33 +01:00
Robin Müller f8077ba6e3 Replace the hacky storing of the project in the GitLabPushTrigger.DescriptorImpl by a lookup of the Job ancestor in the current request 2016-03-15 21:34:33 +01:00
Robin Müller ccb1b23984 Remove unused methods 2016-03-15 21:34:33 +01:00
Robin Müller 03f4ee3ff9 Move triggering of merge request event builds to a separate class 2016-03-15 21:34:33 +01:00
Robin Müller 6996a0cfb2 Move triggering of push event builds to a separate class 2016-03-15 21:34:33 +01:00
Robin Müller f868327714 Remove unused class 2016-03-15 21:34:33 +01:00
Robin Müller 92b79677d2 Use an enum to define the different branch filter types 2016-03-15 21:34:33 +01:00
Robin Müller c7f79095b6 Add further build variables 2016-03-15 21:34:33 +01:00
Robin Müller 292072504b Remove the old model classes 2016-03-15 21:34:33 +01:00
Robin Müller 37445290ee Add a RunListener that sets up an Environment with all build variables of a GitLabWebHookCause 2016-03-15 21:34:33 +01:00
Robin Müller 48f2cb53d2 Use the new POJOs instead of the old model objects 2016-03-15 21:34:33 +01:00
Robin Müller 9d048b071d Add simple POJOs that implement the GitLab web hook model objects 2016-03-13 18:21:20 +01:00
Robin Müller e3e29a34c5 Add some logging for the web hook processing 2016-03-13 18:12:31 +01:00
Robin Müller 73583f1728 Use status not_found instead of pending if there is currently no build for a given commit sha1 (fixes #159) 2016-03-12 23:04:32 +01:00
Robin Müller c87f1ea903 Move status images to the resources directory so they are easier to access 2016-03-12 23:04:32 +01:00
Robin Müller 2f9a10571f Moved the resolution of the WebHookActions to a separate class 2016-03-12 23:04:32 +01:00
Robin Müller 00126cb554 Move build actions of the GitLabWebHook to separate classes 2016-03-12 23:04:32 +01:00
Robin Müller 0b2ef2e722 Move all status related actions of the GitLabWebHook to separate classes 2016-03-12 23:04:32 +01:00
Robin Müller a28a4b4af6 Move generation of status json and png to separate classes 2016-03-12 23:04:32 +01:00
Robin Müller d11942efe3 Add functionality to configure multiple GitLab instances 2016-03-12 23:03:34 +01:00
Robin Müller c457e13d6a Add functionality to add the new publisher automatically to old jobs if addCiMessage was activated for the GitLabPushTrigger 2016-03-10 22:06:16 +01:00
Robin Müller d6bb94b833 Use correct spelling of autoCompleteDelimChar attribute 2016-03-10 22:06:16 +01:00
Robin Müller 887583fc43 Move commit status handling to a Notifier extension 2016-03-10 22:06:16 +01:00
Owen Mehegan 29c4043f80 Switch to new parent pom, https://github.com/jenkinsci/plugin-pom 2016-03-03 13:59:19 -08:00
Owen Mehegan 7eec9b7e70 Merge pull request #205 from froque/multi-scm
closes #183 Plugin not working with multiple SCM configuration
2016-03-01 14:00:39 -08:00
Owen Mehegan 72c72cb453 Merge pull request #209 from jenkinsci/fix_mr_status_pending
Don't ignore push builds when responding to status query
2016-03-01 13:50:08 -08:00
Owen Mehegan d705ceb42f Merge pull request #206 from jenkinsci/revised_workflow_branch_param_fix
Fix Jenkins Workflow support in build trigger code
2016-03-01 13:49:27 -08:00
Robin Müller ae8eefbcd2 Add GitLabMergeCause with a CauseAction to the scheduled build 2016-03-01 10:40:16 -08:00
Owen Mehegan f0279355a1 Fix Jenkins Workflow support so that triggered builds receive the right parameters from GitLab 2016-03-01 10:40:00 -08:00
Filipe Roque efecf7d17b removed source code comments as requested by coder-hugo. 2016-02-29 12:35:23 +00:00
coder-hugo ba8246b8ed Merge pull request #195 from team-supercharge/gitlabUserEmailNullLogging
Fix NPE if there is no assignee of the MR
2016-02-28 21:21:38 +01:00
Robin Müller 49c505544d Return either "" or "NameBasedFilter" for branchFilterName depending on the old value of allowAllBranches for jobs where branchFilterName is null (fixes #202) 2016-02-27 13:29:58 +01:00
Owen Mehegan 8354147f0a When responding to build status requests from MR, don't ignore builds triggered by pushes. Fixes https://github.com/jenkinsci/gitlab-plugin/issues/86 2016-02-25 14:55:20 -08:00
Robin Müller 6d8fa91fb6 Preselect first option of branchFilterName radio group to prevent a NPE while saving 2016-02-25 22:29:38 +01:00
Filipe Roque 7768c66c8a closes #183 Plugin not working with multiple SCM configuration (and duplicated #187)
See https://issues.jenkins-ci.org/browse/JENKINS-26587 and https://github.com/jenkinsci/git-plugin/pull/296
for more information
2016-02-22 20:44:51 +00:00
Csaba Kozak 62b02fe086 Fix NPE if there is no assignee of the MR
Related to https://github.com/jenkinsci/gitlab-plugin/pull/170
2016-02-17 11:29:05 +01:00
Owen Mehegan 75ebe514ea Merge pull request #141 from theobisproject/refactoring
Refactoring data objects to own package
2016-02-16 12:12:18 -08:00
Owen Mehegan 9c3e58734a Merge pull request #182 from sebastienbonami/canceled_status
Status to canceled instead of failed if Jenkins build is aborted
2016-02-16 12:00:29 -08:00
Owen Mehegan 4dcb14a45f Merge pull request #139 from markus-mnm/125-Use_reponame_for_branch_caching
125 use reponame for branch caching
2016-02-16 11:40:32 -08:00
Sébastien Bonami 5fa754b35b Status to canceled instead of failed if Jenkins build is aborted 2016-01-16 13:36:40 -05:00
Oscar Salvador Morillo Victoria 4da58e696b New feature: Add support for regex based filtering and more
Two new features were introduced:

(1) Allow branch filtering through regular expressions
(2) Use branch filtering also for Merge Request events

By making use of radioBlocks, the user is forced to choose
between allowing all branches to trigger the job and filtering
the branches by one out of two possible approaches:

* filtering by name
* filtering by regular expression

[FIXED #97]
[FIXED #142]
2016-01-12 21:05:51 +01:00
theobisproject 1eb6656ab9 Moved gitlab data objects to own package 2016-01-10 10:08:25 +01:00
Andreas Böhme b5c9f5fcd0 Bug #160: allow merge requests to different branches from one commit. (reverted all formattings) 2015-12-18 23:18:42 +01:00
Markus Ebenhoeh 8d5566bc8f Add more descriptive message to exception logs 2015-12-02 18:54:26 +11:00
Owen Mehegan 258f65b890 Merge pull request #128 from illay1994/master
Add two variable gitlabUserName and gitlabUserEmail
2015-11-30 17:11:08 -08:00
Tom Andrews 6e3b157914 Fix logging of Author and Assignee 2015-11-23 17:18:43 +00:00
Tom Andrews 8eedf3dfd6 Switch to getOpenMergeRequests api call 2015-11-23 17:13:04 +00:00
Tom Andrews a3bb47b2f7 Make ci-skip for merge requests respect option configuration 2015-11-23 17:13:04 +00:00
Markus Ebenhoeh 6cbec65184 remove unused import 2015-11-22 13:54:23 +11:00
Markus Ebenhoeh eca37bcef9 Inject GitLab in branch service instead of API
Changed the implementation to awlays inject gitLab (factory)
into getBranches call to allow for gitLabAPI configuration changes.
Otherwise a change to the servername would require a server restart.

Fixes #125
2015-11-22 13:30:04 +11:00
Markus Ebenhoeh b2fa80d4cf Move getBranches logic to separate class
* Replace logging of job.getName with getFullname
* Change cache key from job name to repo URL
* Change cache mechanism to allow expriry
* Cache gitlab project list

Fixes #125
2015-11-22 10:51:55 +11:00
Owen Mehegan 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
Owen Mehegan 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
Owen Mehegan 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
Markus Ebenhoeh b4899a1f75 fallback to after sha on null checkout sha
[FIXED gitlab-plugin-126]
2015-11-15 12:39:59 +11:00
Tom Elfring 17b451b685 Fix incorrect CommitStatus status value 2015-11-14 14:41:43 +01:00
Illya Mazyriak 2c9e47398e Merge remote-tracking branch 'upstream/master' 2015-11-14 14:05:41 +02:00
Mathias Rühle 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
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
Illya Mazyriak 58af7ef453 Add two variable gitlabUserName and gitlabUserEmail in MergeRequest
and resolve JENKINS-30874
2015-11-05 10:37:29 +02:00
Illya Mazyriak 40ade72231 Add two variable gitlabUserName and gitlabUserEmail 2015-11-04 18:43:05 +02: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
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
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
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
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
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
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
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
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
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
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
xhaggi f57812ae89 [webhook] extends logging with request path 2015-04-28 10:06:11 +02:00
xhaggi 9b2d246991 [webhook] extract pushed branch from webhook url if exists 2015-04-28 10:06:11 +02:00
bassrock b9190c47ed Merge pull request #75 from xhaggi/feature/extends-jobs-default-parameter
Extends jobs default parameter with gitlab plugin parameter
2015-04-27 09:57:25 -07:00
xhaggi a4552ab30b Fix broken build links since GitLab 7.10 2015-04-27 16:51:18 +02:00
xhaggi 59d39eaf2b Extends jobs default parameter with gitlab plugin parameter
Instead of only passing the gitlab plugin specific parameters to the
build this will load the jobs default parameters and extends it by the
gitlab plugin parameter. Now it's possible to use additional parameters
added to your job configuration.

It also fix the exception 'Unrecognized macro 'XXX' in '${XXX}'' which
is thrown if you've specified additional parameters for your job.
2015-04-23 10:39:25 +02:00
Nathan W e1acdd5d27 Added voting on merge request 2015-04-13 12:52:13 -05:00
Daniel Lang e660b6a782 fixed #66, option 'note on merge request' can be deactivated 2015-04-13 09:46:02 +02:00
Wanny 4719ecbefb Merge remote-tracking branch 'upstream/master' into enable_tags 2015-04-10 13:25:03 -07:00
Wanny 86d197601c skip build when a tag is removed 2015-04-10 12:32:35 -07:00
bassrock 4bb13da61c Merge pull request #67 from berni2288/fixmergerequestsrestcall
Fix buildOpenMergeRequests only fetching 20 merge requests from the project
2015-04-09 16:20:20 -07:00
Wanny 75f0070530 build when tag are pushed 2015-04-09 16:10:08 -07:00
Daniel Brooks bde863d81d Creating a ci-skip add-on 2015-03-30 23:24:58 -07:00
bassrock 0054b9dc99 Merge pull request #60 from hsingh/use-job-from-trigger
Add more logging and pass project from trigger
2015-03-24 10:13:15 -07:00
Bernhard Kaszt fc493523b0 Fix buildOpenMergeRequests only fetching 20 merge requests from the project
* It now iterates trough all merge requests, not only the first 20
* It now fetches 100 instead of 20 per rest call (100 is max)
* It only fetches open merge requests now instead of all
2015-03-16 16:08:34 +01:00
Harpreet Singh d8b034fbaf Add more logging and pass project from trigger
Add more logging when build fails because we can't find the correct SCM
configuration. Also pass the project from the trigger into DescriptorImpl
instead of using whatever is in there. This seems to resolve a lot of issues
where DescriptorImpl has the incorrect project and is thrown off by non
git projects in jenkins.
2015-03-10 19:59:26 -04:00
Harpreet Singh 3c305b1b07 Fallback to using build parameters to find build when merge record is not
available.
2015-03-10 17:57:42 -04:00
Daniel Brooks 66d62a4ec3 Adding a checkbox to ignore the filter branches because it seems like on every update Jenkins autoselects branches when we don't want it to 2015-02-19 13:15:01 -08:00
Kasper Fock 675bd8a268 Only build merge request when SHA1 has not been build before.
Added more fields to the merge request in order to get data about the source and target branch. and tha last commit.

Before a new build is scheduled for a merge request we will lookup if we already has build this merge request.

this should fix #50
2015-02-03 11:36:45 +01:00
kasperf 6b7eb9a6a2 Support for accepting merge request
Add support for accepting merge request when jenkins build is successful. This will fix issue #40
This require that the java-gitlab-api](https://github.com/timols/java-gitlab-api) version 1.1.8 or newer is released as it depend on the new accept feature in this library
2015-01-28 20:26:46 +01:00
kasperf 54d1c147b8 Fixed #47 by changing to use the target repo id instead of the source id. 2015-01-27 19:23:53 +01:00
bassrock 543366ac35 Merge pull request #36 from kasper-f/locate_build_by_data_from_git_plugin
Locate build by data from git plugin
2015-01-26 23:34:53 -08:00
bassrock 3472c31422 Merge pull request #44 from kasper-f/addNoteOnMergeRequest
Add note on merge request when build completes
2015-01-26 22:52:37 -08:00
bassrock 934a04aa4e Merge pull request #43 from kasper-f/setBuildDescription
Set build description to build cause
2015-01-26 13:33:13 -08:00
Kasper Fock cca3e95c20 Changed image delivery to server the file using IOutils to copy the stream instead of the serverFile method as it looks like the StamplerResponse otherwise will cache it. (Have also tried with a temporary redirect).
This implementation is inspired by the [embeddable-build-status-plugin](https://github.com/jenkinsci/embeddable-build-status-plugin)  [StatusImage](https://github.com/jenkinsci/embeddable-build-status-plugin/blob/master/src/main/java/org/jenkinsci/plugins/badge/StatusImage.java)
2015-01-26 15:56:48 +01:00
Kasper Fock 8ac394b64e Fixed #28 "Build status icon toggling" by adding a flush of the request after the image is served 2015-01-22 11:47:45 +01:00
Kasper Fock 3e23ec1fdb Add option to chose to leave a note in a merge request when the build completes with build status.
This is a candidate to fix #41
2015-01-22 10:24:59 +01:00
Kasper Fock 8b813b7697 Code cleanup 2015-01-21 09:30:17 +01:00
Kasper Fock cf13cbc89e Bug fixing and testing 2015-01-21 09:10:20 +01:00
Kasper Fock cb1103d84e Add the option to select whatever the jenkins job view name should be set to the build cause (GitLab Merge Request #XX or GitLab Push ####### by Author)
This is a candidate to fix issue #39
2015-01-20 12:13:45 +01:00
Dimitris Stafylarakis 9ee33217d4 Merge remote-tracking branch 'origin/master' into develop 2014-12-28 06:39:41 +01:00
kasperf 93e0fd34f8 Merge remote-tracking branch 'parent/develop' into locate_build_by_data_from_git_plugin 2014-12-22 00:35:40 +01:00
kasperf aaada90678 Changed getBuildBySHA1 and getBuildByBranch to use the git plugins MergerRecord and BuildData to determine if the build is a merge whet SHA1/branch the build cover.
The getBuildByBranch will only return builds that is not build from a merge.

[MergeRecord] (https://github.com/jenkinsci/git-plugin/blob/master/src/main/java/hudson/plugins/git/util/MergeRecord.java)
[BuildData] (https://github.com/jenkinsci/git-plugin/blob/master/src/main/java/hudson/plugins/git/util/BuildData.java)
[Build](https://github.com/jenkinsci/git-plugin/blob/master/src/main/java/hudson/plugins/git/util/Build.java)
2014-12-22 00:18:22 +01:00
Dimitris Stafylarakis 2d1bf1fe56 Updated documentation and Changelog
Minor refactoring
2014-12-21 09:38:37 +01:00
kasperf a3e6116805 Merge remote-tracking branch 'parent/develop' into check_merge_request_on_push 2014-12-20 23:04:59 +01:00
kasperf 78138d1bc6 Added a config option to let the user select whatever we want the plugin to trigger a rebuild of open merge requests when receiving a push event from GitLab 2014-12-20 22:23:19 +01:00
Dimitris Stafylarakis da6a508864 Merge branch 'develop' of github.com:DABSquared/gitlab-plugin into develop 2014-12-20 15:22:38 +01:00
xaniasd 8d0a780a8a Merge pull request #33 from kasper-f/redirect_commit_to_build_page
Added "commits" to be redirected to build page.
2014-12-20 15:22:35 +01:00
Dimitris Stafylarakis d2c5c67f87 Merge conflicts resolved 2014-12-20 15:21:23 +01:00
Kasper Fock 235544e67f Cleanup: Removed logging used for debugging 2014-12-16 09:11:24 +01:00
Kasper Fock 9db85c7b9f Found that the id from the ObjectAttribute dit not point to the id of the merge request. In my cases the iid has the number of the merge request.
This commit adds the iid to the ObjectAttribute and changes the GitLabMergerCause description to us this instead of the id.
2014-12-15 15:21:03 +01:00
Kasper Fock 983baa0dfc Found that the id from the ObjectAttribute dit not point to the id of the merge request. In my cases the iid has the number of the merge request.
This commit adds the iid to the ObjectAttribute and changes the GitLabMergerCause description to us this instead of the id.
2014-12-15 12:08:29 +01:00
Kasper Fock b5e564a664 Added "commits" to be redirected to build page. This URL is called from gitlab merge request page with a link next to the jenkins build status.
Furthermore added a logger warning to notify when a url is not matched.
2014-12-11 13:27:57 +01:00
Dimitris Stafylarakis 145271ba66 Fix #18: updated git plugin to 2.3.1 (as a consequence, minimum supported version of Jenkins is now 1.568) and used git data to detect proper build 2014-12-01 23:42:40 +01:00
xaniasd 488c569796 Merge pull request #31 from ugomeda/master
Add a CrumbExclusion for the /project/ path
2014-11-30 17:03:34 +01:00
Dimitris Stafylarakis 6ad6804cb4 support /project/PROJECT_NAME?ref=BRANCH_NAME
fix #21 and #25
partial fix for #18
2014-11-30 15:33:17 +01:00
axb 6c59aaceed fix bug that settings page while not show any branch if gitlab repo uses http protocol 2014-11-20 13:59:20 +08:00
Ugo Méda dec7f78a6c Add a CrumbExclusion for the /project/ path 2014-10-06 10:53:32 +02:00
bassrock 44edf2ed18 Adding a filter for issue #17 2014-10-05 10:58:31 -07:00
Dimitris Stafylarakis f52601f144 Fixes #15 (thanks @FrantaM)
Improves security of plugin (thanks @FrantaM)
Add unstable build status
2014-09-10 23:16:26 +02:00
Dimitris Stafylarakis 774a8b42ff Cleanup debug messages 2014-09-04 11:01:57 +02:00
Dimitris Stafylarakis 630b3cb055 cleanup unused imports 2014-09-03 16:27:38 +02:00
Dimitris Stafylarakis a92c1bf251 allowed branches filter only for Push events
Refactor status.png functionality to support Jenkins instances using
authentication
2014-09-03 15:58:42 +02:00
Dimitris Stafylarakis 48d67cdf99 Merge branch 'master' into develop 2014-09-01 23:24:16 +02:00
Dimitris Stafylarakis 2ede215115 remove update branches for now 2014-09-01 23:24:00 +02:00
Dimitris Stafylarakis 828c51375f keep communication to gitlab optional 2014-09-01 23:20:52 +02:00
xaniasd 8739dbc84c Merge pull request #12 from alexiskapit/fix-project-search-d
Fix project search
2014-09-01 13:56:27 +02:00
Dimitris Stafylarakis c2a954e7d5 Filter branch functionality 2014-09-01 12:03:22 +02:00
Dimitris Stafylarakis 17dcc03a0a refactor requests to both use gson
fixed bug in getSourceRepoURLDefault
2014-08-30 23:21:16 +02:00
xaniasd 58e0863342 Merge pull request #11 from DABSquared/issue_9
Support different date formats
2014-08-30 18:36:00 +02:00
Alexis Kartmann a2a6fec836 Fix project find loop by stopping on a project. 2014-08-29 18:50:10 +02:00
Dimitris Stafylarakis d105944a18 add test connection button to global configuration screen 2014-08-08 16:24:40 +02:00
Dimitris Stafylarakis f488686c4b fix issue #9 2014-08-08 15:16:34 +02:00
Dimitris Stafylarakis 469bc22936 support multiple date formats 2014-08-08 15:04:01 +02:00
Dimitris Stafylarakis f0ae42ce83 Merge branch 'master' into token
Conflicts:
	src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java
2014-08-06 14:42:43 +02:00
Dimitris Stafylarakis bf80ddcb9d merge conflict resolved 2014-08-06 14:38:52 +02:00
Dimitris Stafylarakis c3ee86a34e removed connection check from global configuration
add variables gitlabSourceRepoName and gitlabSourceRepoURL to
MergeRequest builds
get source project data through gitlab api
implement #4
2014-08-06 14:15:31 +02:00
Dimitris Stafylarakis 137a7f094e default value for triggers is true 2014-08-05 18:52:47 +02:00
Dimitris Stafylarakis c65480f65b add getters for trigger flags 2014-08-02 13:25:08 +02:00
Dimitris Stafylarakis f6ac90af87 filter incoming triggers 2014-08-02 11:02:44 +02:00
Dimitris Stafylarakis 33a177a043 Use java-gitlab-api to communicate with the Gitlab instance
Global configuration screen for host url and api token
fixed parameters of GitLabMergeRequest and GitLabPushRequest classes for correct JSON binding
2014-08-02 09:40:23 +02:00
bassrock 42cd52ae5c Merge pull request #3 from FrantaM/folders
Support jobs that are nested in ItemGroups.
2014-07-31 10:00:31 -07:00
Johannes Schüth b9ea3fe168 Fix various broken images
* Fix various image urls that were not changed when the artifactid of the project was changed.
* Update readme accordingly
2014-07-31 16:36:52 +02:00
Franta Mejta e8c9a7c96f Support jobs in that are nested in ItemGroups. 2014-07-25 18:19:36 +02:00
Daniel Brooks 8241762639 Making branches not split with \ and instead use replace. 2014-07-06 12:43:19 -07:00
Daniel Brooks adb2c6dca8 Changing parameter names to not interfere with Jenkins Defaults. 2014-07-01 11:48:51 -07:00
Daniel Brooks 0c511bb99f Finsihing up 1.0 2014-06-30 21:57:20 -07:00
Daniel Brooks 62bde3e036 Using proposed solution from Gitter to do the merging by faking a merge. This will require to build parameters however. 2014-06-29 23:07:27 -07:00
Daniel Brooks fc62091b64 Separating out the Build Causes. 2014-06-08 14:00:49 -07:00
Daniel Brooks 05c1663965 Removing the Polling Log Page. 2014-06-08 13:58:18 -07:00
Daniel Brooks a8e420cff6 Making the build plugin build the SHA1 that was in the payload. 2014-06-08 13:53:26 -07:00
Daniel Brooks 836cb9a362 Adding in base build triggers for merge requests and pushes 2014-05-31 13:55:48 -07:00
Daniel Brooks e2d59658d2 Fixing build error 2014-05-30 11:50:13 -07:00
Daniel Brooks 6bb6528469 Working on the build trigger 2014-05-30 11:40:08 -07:00
Daniel Brooks 7250a0b54a Fixing build redirect. 2014-05-30 00:05:27 -07:00
Daniel Brooks c1e5cc41e0 Making SHA contains instead of equals to support small sha tags 2014-05-30 00:00:09 -07:00
Daniel Brooks 308bbe25c7 Got most of it all working except starting a build 2014-05-29 23:26:13 -07:00
Daniel Brooks aee1376a43 Adding status png for commits sha1 2014-05-29 11:18:40 -07:00
Daniel Brooks dfb2527b26 Adding build number to status. 2014-05-29 00:07:29 -07:00