Commit Graph

958 Commits

Author SHA1 Message Date
Owen Mehegan 86c24a9518
README: fix doc for using forked repos (I think)
Fixes #428
2018-03-21 16:56:30 +11:00
Owen Mehegan 367e18f21f
Merge pull request #726 from pdudits/issue-663
Do not build approved merge requests unless specified so
2018-03-21 16:21:42 +11:00
Owen Mehegan ebc15db4d9
README: fix table of contents 2018-03-20 17:39:17 +11:00
Owen Mehegan 785fe61b61
README: reorganize a lot of the documentation 2018-03-20 17:20:10 +11:00
Patrik Dudits 554bb618a5 Do not build accepted merge requests unless specified so in the configuration.
The combination of state and action upon approval is "updated" and "approved". Therefore
such combination cannot be excluded by using logical or.

Therefore the meaning of the arguments to MergeRequestHookTriggerHandlerImpl changed,
and tests were adjusted properly.
2018-03-19 16:10:54 +01:00
Owen Mehegan 087796e0af
README: some cleanup of job configuration doc 2018-03-19 17:48:14 +11:00
Owen Mehegan 926ea00b81
Add request for maintainers to README 2018-03-19 17:19:15 +11:00
Owen Mehegan e11ef82b43 Remove references to the fact that commit status support was introduced (2.5 years ago) in GitLab 8.1 2018-03-19 17:02:00 +11:00
Owen Mehegan a45f2f4ed2
Merge pull request #724 from Kindrat/master
removed ignored IDE config
2018-03-19 15:49:31 +11:00
Owen Mehegan a2b8394ec0
Merge pull request #714 from jakub-bochenski/patch-4
Add getter to triggerOnApprovedMergeRequest
2018-03-19 15:21:43 +11:00
Oleksii Ignachuk b6ff5dc78d removed ignored IDE config 2018-03-12 20:12:08 +02:00
jakub-bochenski 134ba489c1
Add getter to triggerOnApprovedMergeRequest
Fixes #711
2018-02-14 18:19:18 +01:00
Owen Mehegan 80c3786af2
Merge pull request #710 from acdcjunior/patch-1
Readme: remove < from <your-gitlab-connection-name and other formatting
2018-02-06 11:28:30 +11:00
Antônio "acdc" Jr 896861595e
Readme: remove < from <your-gitlab-connection-name and other formatting 2018-02-05 15:48:32 -02:00
Owen Mehegan 13fc0ff3a9 [maven-release-plugin] prepare for next development iteration 2018-02-05 11:39:14 +11:00
Owen Mehegan 79ca08365d [maven-release-plugin] prepare release gitlab-plugin-1.5.3 2018-02-05 11:39:00 +11:00
Owen Mehegan a20c50399c Update changelog for 1.5.3 2018-02-05 11:05:08 +11:00
Owen Mehegan 6ac67a162b
Merge pull request #622 from sbrassely/fix-workflow-steps
[BIS] Fix issue #506 : GitlabCommitStatus throws error after force kill
2018-02-05 10:56:37 +11:00
sbrassely 5e95ffce1d Fix invalid import after resolving conflicts 2018-02-02 17:10:55 +01:00
Brassely Stéphane 0f77523137
Merge branch 'master' into fix-workflow-steps 2018-02-02 17:41:43 +02:00
Owen Mehegan 438e6ccae6
README: add a note explaining gitlab API vs git clone credentials 2018-01-23 18:04:10 +11:00
Owen Mehegan 52be3d7906 Add doc on how to set up webhooks in the docker gitlab test env 2018-01-23 17:54:42 +11:00
Owen Mehegan 2e0223241a
README: add documentation for the secret token feature 2018-01-23 17:51:37 +11:00
Owen Mehegan 13f8d74770
README: refactor global configuration and auth doc 2018-01-23 17:03:45 +11:00
Owen Mehegan 3ec7641df8 README: typo in properties step syntax 2018-01-22 16:33:39 +11:00
Owen Mehegan a7938df166 Fix spelling mistakes 2018-01-15 18:28:58 +11:00
Owen Mehegan e7bcb9e6b4
Merge pull request #686 from smutel/master
Improve doc to setup webhook with folders
2018-01-15 17:33:46 +11:00
Owen Mehegan 8ccafe71ee
Merge pull request #678 from Argelbargel/fix-655
Fixes NPE if GitLab connection fails
2018-01-15 17:16:27 +11:00
Owen Mehegan 4ef2437a07
Merge pull request #670 from jakub-bochenski/patch-3
Set default maven goals
2018-01-15 17:11:11 +11:00
Karsten Kraus 5595e6bdcd Added test to ensure that respects non-proxy-hosts 2018-01-03 00:41:16 +01:00
Karsten Kraus 2f0c76261b ResteasyGitLabClientBuilder respects non-proxy-hosts 2018-01-03 00:10:27 +01:00
smutel f9e3299868
Merge pull request #1 from smutel/smutel-patch-1
Improve doc to setup webhook with folders
2017-12-14 09:04:34 +01:00
smutel cdb6a39092
Improve doc to setup webhook with folders
Add a comment to improve accuracy when setup a webhook with Jenkins Multibranch Pipeline/Workflow job inside folders.
2017-12-13 10:49:08 +01:00
jakub-bochenski 316b8bebb8 Don't check LastCommitNotYetBuild on Approve MR action (#664)
* Don't check LastCommitNotYetBuild on Approve MR action

* Add @DataBoundSetter
2017-12-11 11:59:14 +01:00
Karsten Kraus 4291a1377f switch connection-testing and api-autodetection to get-request as head request might cause NPE (see RESTEASY-1347) 2017-12-03 22:43:44 +01:00
Owen Mehegan ab51c7f2f5 [maven-release-plugin] prepare for next development iteration 2017-11-24 09:18:41 -08:00
Owen Mehegan 075eb93da9 [maven-release-plugin] prepare release gitlab-plugin-1.5.2 2017-11-24 09:18:30 -08:00
Owen Mehegan fb39773723
Merge pull request #672 from mreichel/FixCommitStatusUpdaterTest
Fix CommitStatusUpdaterTest
2017-11-24 09:14:52 -08:00
milena 427b08de1d
Fix CommitStatusUpdaterTest 2017-11-24 12:41:34 +01:00
Owen Mehegan 7faee75f86 Update changelog for 1.5.2. 2017-11-22 15:44:21 -08:00
Owen Mehegan d044f8abff Update docker-compose to version 2 so bidirectional comm between jenkins and gitlab is possible. 2017-11-22 15:34:09 -08:00
Owen Mehegan 4d50561562
Merge pull request #658 from TheUbuntuGuy/feature/mf.commitstatusdescription
Use current build state for description in commit API calls
2017-11-22 15:21:16 -08:00
Owen Mehegan f5b171343c
Merge pull request #657 from adjika/typo-patch
Fixes typo in CauseData.MapWrapper
2017-11-22 11:10:08 -08:00
Owen Mehegan 77e26fa978
Merge pull request #639 from jeckhart/fix-npe-in-namebasedfilter
Fixes #638 - Don't NPE if one of the filter specs is not specified in a Jenkinsfile
2017-11-22 11:08:41 -08:00
Owen Mehegan 2d85636a2b
Merge pull request #616 from g-dx/master
Make it easier to configure gitlab-plugin from Job DSL plugin.
2017-11-22 10:56:00 -08:00
Owen Mehegan f8c9cbd5c2
Merge pull request #564 from TestYourLuck/downstream_build_support
Build status can be sent to GitLab from builds downstream of the one that GitLab triggered.
2017-11-22 10:50:40 -08:00
milena 19af905948 fix review issue 2017-11-21 15:30:35 +01:00
milena 16418da268
fix tests after commit f56a896039 2017-11-21 13:47:58 +01:00
milena 8c075f8506 Merge remote-tracking branch 'upstream/master' into downstream_build_support 2017-11-21 13:04:10 +01:00
jakub-bochenski c2cc4abebf
Change default goal to install because of `jenkins.war is not in the classpath` 2017-11-20 16:27:23 +01:00