Commit Graph

462 Commits

Author SHA1 Message Date
Robin Müller e01901478b Update the commit status for MRs always on the target project (Fixes #344) 2016-09-07 22:28:29 +02:00
Robin Müller 8034367df6 Remove checkbox for "Accept merge request on success" from GitLabPushTrigger 2016-09-05 22:16:42 +02:00
Robin Müller d566923021 Add possibility to add build status only for failed builds to MR (Fixes #345) 2016-09-04 20:53:32 +02:00
Robin Müller 013d331efd Add workflow step for accepting a MR 2016-09-04 20:25:04 +02:00
Robin Müller f7bea1ae87 Add Notifier for accepting a MR on success 2016-09-04 20:25:04 +02:00
Robin Müller 1cae833f60 Add MergeRequestNotifier that provides common used methods for GitLabVotePublisher and GitLabMessagePublisher 2016-09-04 20:25:04 +02:00
Robin Müller f9577ca03a Add option to mark unstable builds as success in GitLab (Fixes #190) 2016-09-04 20:25:04 +02:00
Robin Müller 9e67af1af2 Add a workflow step for adding comments to a MR 2016-09-04 20:25:04 +02:00
Robin Müller 1164b2f8bf Add convenience static getClient method to GitLabConnectionProperty that retrieves the GitLab client for a given build 2016-09-04 20:25:04 +02:00
Robin Müller b78c69d1ca Add Notifier for adding a vote to a GitLab MR (Fixes #168) 2016-09-04 20:25:03 +02:00
sh0ked adc2c63b27 customize notes for merge requsts (Fixes #201) 2016-09-04 20:24:38 +02:00
Robin Müller d94d0c0c25 Simplify the UI for selecting the GitLabPushTrigger options
- add an entry that shows all possible trigger events and use the trigger names shown on the GitLab webhooks page
- hide all other options in an advanced block
2016-09-03 22:54:37 +02:00
Robin Müller 4b7ea61974 Change order of GitLabPushTrigger options
- push is the most common use-case for triggering a build so move it to the top
- "Rebuild open Merge Requests" belongs to the MR event so it should be next to it
2016-09-03 22:54:37 +02:00
Robin Müller 3b32a0ac85 Fix possible NPE while setting the build status to pending (Fixes #404) 2016-08-31 21:17:11 +02:00
Robin Müller 5b44078209 Catch Throwable instead of Exception as NoClassDefError doesn't extend the Exception class 2016-08-31 15:50:52 +02:00
Robin Müller 3fe8d554ed Allow null values for targetUrl as this isn't available in web hooks of older versions of GitLab (Fixes #402) 2016-08-31 12:47:39 +02:00
Robin Müller 3441703df3 Use author of the last commit for "pushed by" description 2016-08-27 17:42:19 +02:00
Alexander "Ace" Olofsson a8f14558b5 Fix gitlabBuilds step to actually use 'pending' 2016-08-25 10:56:57 +02:00
Robin Müller 00c2265a0e Merge pull request #392 from dforbesfds/feat/parameters/mr-last-commit
feat(parameters): [mr-last-commit]
2016-08-23 14:15:46 +02:00
Benjie Gatt 2fd683ed3b Decreased level of synchronisation required by publisher to allow concurrent builds to execute without locking up 2016-08-22 14:40:55 +02:00
Dan Forbes 68772128ba feat(parameters): [mr-last-commit] Add merge request last commit ID to the set of parameters that are exposed as environment variables. 2016-08-15 15:46:05 -05:00
Robin Müller b39e2321ba Catch exception that may occur while retrieving the available gitlab credentials if the plain-credentials plugin isn't installed 2016-08-13 18:58:10 +02:00
Robin Müller 3cf5f312e6 Render a link to the MR in the short description as long as not the "Escape HTML" formatter is selected (Fixes #69) 2016-07-22 22:21:26 +02:00
Robin Müller 1e600fe602 Add a BasicCredentialsProvider for the proxy credentials if they are set 2016-07-22 12:34:39 +02:00
Robin Müller f23501e094 Add gitlabBuilds step to notify GitLab about pending builds within a pipeline job (Fixes #383) 2016-07-21 23:34:58 +02:00
Robin Müller 4e116ab2ee Add updateGitlabCommitStatus step for setting a custom build state for a commit 2016-07-21 23:34:52 +02:00
Robin Müller 2aa01588a3 Add null check while retrieving the Jenkins proxy configuration 2016-07-21 20:33:26 +02:00
Robin Müller 633a103cb9 If a global HTTP proxy is configured use this also as proxy for the gitlab API (Fixes #382) 2016-07-20 23:17:31 +02:00
Robin Müller 8eb7adb04c Fix errors during deserialization of GitLabPushTrigger config (Fixes #299) 2016-07-20 23:17:31 +02:00
Robin Müller 8da0bf2945 Add domain requirements for retrieving the API Token credentials 2016-07-12 17:02:43 +02:00
Robin Müller d404a9dc4d Notify SCMSourceOwners about changes for GitLab Push Hooks (Fixes #298) 2016-07-09 17:15:02 +02:00
Robin Müller b810e595de Use the commitId of the GitLab hook for builds triggered by GitLab to update the commit status (Fixes #374) 2016-07-09 17:15:02 +02:00
Robin Müller 57056db5d8 Only migrate GitLabConnections that have an apiToken set 2016-06-26 21:06:25 +02:00
Robin Müller 1007bb5db6 Use the GitLabApiToken instead of a StringCredentials in the migration of the GitLabConnections (Fixes #366) 2016-06-26 21:05:29 +02:00
Robin Müller 43cb300e2c Use getMarked revision of a build to get a merge build by SHA1 (Fixes #361) 2016-06-25 20:35:53 +02:00
Robin Müller 336ffe705f Implement custom credentials for a GitLab API token (Fixes #332)
- this custom credentials implementation provides the possibility to use labels and description text that makes it easier to configure a GitLabConnection
2016-06-25 15:11:19 +02:00
Robin Müller 783b0420a0 Allow also UsernamePasswordCredentials for the GitLabConnection 2016-06-25 15:11:19 +02:00
Robin Müller a2edfcc9d0 Add gitlabBefore and gitlabAfter environment variables for push events (Fixes #257) 2016-06-25 15:11:15 +02:00
Robin Müller b5c73fe5f7 Add possibility to skip builds for WIP MRs (Fixes #261) 2016-06-25 13:45:38 +02:00
Robin Müller 1acb7d0031 Add RevisionParameterAction also for rebuilding open MRs (Fixes #340) 2016-06-24 23:18:13 +02:00
Robin Müller 9386f05d09 Send build status pending before scheduling a build for jobs that have a GitLabCommitStatusPublisher configured (Fixes #317) 2016-06-24 23:17:16 +02:00
Robin Müller acf459ad5a Skip build if the last and not the first commit of a push hook contains [ci-skip] (Fixes #306) 2016-06-23 22:58:38 +02:00
Robin Müller 11c67f91d8 Fix logging message string 2016-06-23 22:30:57 +02:00
Robin Müller 2b9f51c88e Restructure code for GitLab client generation for better readability 2016-06-23 22:30:57 +02:00
Robin Müller 851ec6cec3 Add functionality to configure a custom build name for the commit status updates (Fixes #362) 2016-06-23 22:30:57 +02:00
Robin Müller e2cff62a0b Catch client exceptions while retrieving the projectId from GitLab 2016-06-23 22:30:56 +02:00
Robin Müller 0d0c3f9282 Fix regex for retrieving the projectId of the remoteUrl 2016-06-23 22:30:56 +02:00
Robin Müller 14834ea886 Use List<MergeRequest> instead of Response as return value for getMergeRequests
- retrieving all MergeRequest pages of the API works now without reading the response headers
  -> the Response isn't necessary anymore as return value
2016-06-22 23:27:04 +02:00
Robin Müller 5435cfcee9 Just increment the page number instead of using the X-Next-Page header for retrieving all open MRs (Fixes #358) 2016-06-22 23:13:14 +02:00
Robin Müller 6247055edb Remove path segments of the remoteUrl that don't belong to the projectId (Fixes #364) 2016-06-21 22:26:26 +02:00
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