Commit Graph

869 Commits

Author SHA1 Message Date
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
Mark Furneaux f6d5c8bd7e Use build state for description
To be in line with GitLab CI's use of the field.
2017-11-15 20:37:17 -05:00
Owen Mehegan c5c7f2bb61
Merge pull request #524 from i386/topic/display-url
Fix: If BlueOcean is installed, build URL does not point to BlueOcean
2017-11-14 14:26:38 -08:00
Owen Mehegan a0fa5b98d5 This reverts the change in #565, which was made in error. 2017-11-14 11:25:06 -08:00
milena a23a3ed521 fix tests 2017-11-14 16:52:04 +01:00
milena 4f75658601 Merge remote-tracking branch 'upstream/master' into downstream_build_support 2017-11-14 16:47:25 +01:00
Karsten Kraus f56a896039 fixed tests 2017-11-14 11:51:38 +01:00
Karsten Kraus b9314197b6 moved dependency down 2017-11-14 10:30:21 +01:00
Karsten Kraus d3edcf300d Merge branch 'upstream-master' into pr/524
# Conflicts:
#	src/main/java/com/dabsquared/gitlabjenkins/util/CommitStatusUpdater.java
2017-11-14 10:22:11 +01:00
Owen Mehegan 332c2ffcfa
Merge pull request #589 from Eaglescience/580-separate-actionType-for-tag-push
Make it easier to distinguish a commit push from a tag push.
2017-11-13 15:28:39 -08:00
Owen Mehegan a06432c048
Merge pull request #629 from AnthonyMastrean/patch-1
Update README.md
2017-11-13 15:13:40 -08:00
Owen Mehegan 801d8dd06f
Merge pull request #644 from evgeni/patch-1
fix variable list in readme, the prefix is always gitlab, not git
2017-11-13 15:11:53 -08:00
Owen Mehegan a4ac366a99
Merge pull request #659 from jakub-bochenski/patch-1
Trigger builds when MR is approved
2017-11-13 15:06:22 -08:00
Owen Mehegan 6ef7a8a25c [maven-release-plugin] prepare for next development iteration 2017-11-06 13:46:36 -08:00
Owen Mehegan 35501397de [maven-release-plugin] prepare release gitlab-plugin-1.5.1 2017-11-06 13:46:25 -08:00
Owen Mehegan 0e2328ee67 Revised 1.5.1 changelog due to additional fixes needed. 2017-11-06 13:42:51 -08:00
jakub-bochenski 0ff427acfa
Trigger builds when MR is approved 2017-11-06 14:34:48 +01:00
kfu 2c3cc624cd
fixes minor typo in CauseData.MapWrapper 2017-11-03 21:02:08 +01:00
Mark Furneaux 63341d4bcb Add new date formats (#653) 2017-11-03 12:04:48 -07:00
Karsten Kraus b9efc8ac91 Fixes #652 (#656)
Fixes NPE when MR builds are triggered.
2017-11-03 12:02:43 -07:00
Karsten Kraus 558502510e fixed compilation errors 2017-11-01 21:11:17 +01:00
Owen Mehegan e1e7f63ecd Changelog update for 1.5.1 2017-10-31 10:28:40 -07:00
Karsten Kraus 9428abd4b3 Improved gitlab api autodetection (#650)
* API autodetection without restart is working
* changed the order in which the plugin tries the api. it's now v4 then v3
2017-10-31 10:26:34 -07:00
Karsten Kraus 3887c52c9e Bugfix & Test for #648 (#649)
Fix for NPE when triggering MR build.
2017-10-31 10:25:33 -07:00
Owen Mehegan aff49f0150 [maven-release-plugin] prepare for next development iteration 2017-10-25 10:41:47 -07:00
Owen Mehegan d4d036014f [maven-release-plugin] prepare release gitlab-plugin-1.5.0 2017-10-25 10:41:42 -07:00
Owen Mehegan 04fc6b7632 Update Changelog for 1.5.0 2017-10-25 10:38:39 -07:00
Karsten Kraus 17e89c3fdd Adds support for GitLabAPI V4 while keeping support for V3 (#614) 2017-10-25 10:35:47 -07:00
Evgeni Golov c9f6737ea2 fix variable list in readme, the prefix is always gitlab, not git 2017-10-24 15:35:54 +02:00
Owen Mehegan ca400c19bc Merge pull request #642 from jenkinsci/update-docker-compose.yml-for-integration-tests
Export Docker container postgresql port to host
2017-10-16 14:35:49 -07:00
Karsten Kraus 4fc27ff04c Export postgresql port to host
Updated docker-compose.yml so that it allows to run GitLabIT against the created containers
2017-10-16 22:25:42 +02:00
John Eckhart 5670e3df84
Fixed #638 - Don't NPE if one of the filter specs is not specified in a Jenkinsfile 2017-10-10 12:10:36 -03:00
Owen Mehegan 45217ac90c Update README.md 2017-09-28 10:41:19 -07:00
Anthony Mastrean 46bcdf8349 Update README.md 2017-09-20 14:22:49 -04:00
Owen Mehegan 9a59c37305 Add list of configurable trigger options for declarative builds. Fixes #541. 2017-09-18 15:56:51 -07:00
Owen Mehegan 36aa4c8035 Clarify declarative syntax if using automerge. Fixes #555. 2017-09-18 15:46:54 -07:00
Owen Mehegan ff06980d25 Merge pull request #628 from evgeni/noteRegex
make it clear that the note to trigger a build is a regex, not a plain string
2017-09-18 14:59:00 -07:00