Commit Graph

1112 Commits

Author SHA1 Message Date
TestYourLuck c10e44e270 Merge branch 'master' into downstream_build_support 2017-09-01 10:23:27 +03:00
Bas Breijer 7552305e0d add objectkind to unit test 2017-09-01 07:52:39 +02:00
Owen Mehegan f6b6c5a35f Merge pull request #567 from mreichel/bugfixSecureDefaults
Plugin should have secure defaults
2017-08-31 15:51:33 -07:00
Owen Mehegan 1e66e387af Merge pull request #552 from axls/master
Use GitLab's host url to calculate project's ID
2017-08-31 11:24:04 -07:00
Owen Mehegan 37c5c5479a Merge pull request #483 from necolt/master
Send GitLab messages on unstable builds as well as failed ones
2017-08-31 11:18:21 -07:00
Saulius Grigaitis 23f00a1877 Temporary fix for #452 2017-08-31 10:46:52 +03:00
Alexander Leshkin 1e4a6d3b25 Test cases for subgroup of subgroup. 2017-08-31 10:01:04 +03:00
Alexander Leshkin 3e9cfead0e Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/GitLabApi.java
	src/main/java/com/dabsquared/gitlabjenkins/util/CommitStatusUpdater.java
2017-08-31 09:57:06 +03:00
Owen Mehegan 594a025b5a Merge pull request #540 from mreichel/master
Allow jobs to be triggered by GitLab 'Pipeline' event
2017-08-30 15:22:34 -07:00
Owen Mehegan 03477fa591 Merge pull request #514 from czoellin/master
Fix branch name comparison to avoid spurious builds
2017-08-30 15:22:03 -07:00
Owen Mehegan c6bd0e2eef Add Jenkinsfile to enable builds on https://ci.jenkins.io/ 2017-08-30 14:29:55 -07:00
Owen Mehegan e9f0d27041 Merge pull request #612 from Argelbargel/fix-integration-tests
Fixes GitLabIT#buildOnNote()
2017-08-29 11:31:18 -07:00
Karsten Kraus e081cc9dd6 fixes GitLabIT#buildOnNote() 2017-08-28 16:12:14 +02:00
Karsten Kraus f449f269e7 Revert "added support for travis-builds. Sorry (can we restrict my access
here to the branch-source-branch? ;-))"

This reverts commit 6cb1a19d03.
2017-08-27 22:23:23 +02:00
Karsten Kraus 6cb1a19d03 added support for travis-builds 2017-08-27 22:17:35 +02:00
Joshua Barker 14a1b327a7 Add tests for BuiltUtils methods 2017-08-21 16:16:30 +10:00
Joshua Barker 6c3ab208cf Revert change for getBuildByBranch as its not required 2017-08-21 15:38:42 +10:00
Owen Mehegan 6f46b34a19 Fix docker-compose so Jenkins can talk to GitLab; reorganize documentation for Docker testing 2017-08-08 10:52:17 -07:00
Josh Barker c8ebb2e283 Loop through BuildData as there can be more than one. 2017-08-08 20:00:12 +10:00
Owen Mehegan 46e1af798c Merge pull request #529 from mstg/pipeline-example
README: Better declarative pipeline example
2017-08-02 14:46:36 -07:00
Owen Mehegan 43224bd32c Update docker-compose file to use current GitLab and Jenkins versions. 2017-08-01 22:41:37 -07:00
Owen Mehegan 58ec21d33b Clarify note about bug in older versions of GitLab EE. 2017-07-24 14:17:43 -07:00
milena f44d4352ac #427 comments from github issue 2017-07-21 11:27:45 +02:00
Daumantas Stulgis 4d556113ed Merge remote-tracking branch 'default/master' into downstream_build_support
# Conflicts:
#	src/main/java/com/dabsquared/gitlabjenkins/util/CommitStatusUpdater.java
2017-07-17 13:34:38 +03:00
Bas Breijer ff495a0d0d Add TAG_PUSH action type and detect tag_push using the objectKind in the original cause. 2017-07-17 07:57:11 +02:00
Owen Mehegan de3536a2f9 [maven-release-plugin] prepare for next development iteration 2017-07-14 15:00:29 -07:00
Owen Mehegan b443fe21ef [maven-release-plugin] prepare release gitlab-plugin-1.4.7 2017-07-14 15:00:20 -07:00
Owen Mehegan fea81e4f04 Update changelog for 1.4.7 2017-07-14 14:55:58 -07:00
Owen Mehegan 12298597eb Merge pull request #584 from sbrassely/fix-commit-status-exception
Fix commit status exception
2017-07-14 14:52:57 -07:00
Stephane Brassely ffc1b201f3 Fix #583 : Do not fail build when no SCM revision action is available 2017-07-13 15:57:12 +02:00
milena d16b0cb0b7 Update CHANGELOG.md
Remove changes - they will be added on a release
2017-07-13 15:20:08 +02:00
Stephane Brassely 8d7a8c807e Fix #583 : Commit status fail on push events 2017-07-10 18:09:13 +02:00
Brassely Stéphane 7063999fee Merge pull request #1 from jenkinsci/master
Syncing from original
2017-07-10 16:52:44 +02:00
Alexander Leshkin 9ec5309ccc Restore changes after merge with upstream/master. 2017-07-06 13:17:34 +03:00
Alexander Leshkin 73c54e68c8 Merge remote-tracking branch 'upstream/master' 2017-07-06 13:15:21 +03:00
Alexander Leshkin bb5a2caa8b Fixes #538. Use GitLab's host url to calculate project's id. 2017-07-06 13:14:55 +03:00
Owen Mehegan a30898a921 Merge pull request #578 from chinhodado/patch-1
Fix list indentation in README
2017-07-05 17:18:33 -07:00
Trung Do f0e6b331d8 Fix list indentation in README 2017-07-05 19:18:04 -04:00
Owen Mehegan 6d4647749d Remove old maintainers, add Milena 2017-07-05 15:44:25 -07:00
Owen Mehegan 316d5eaa75 Removing appeal for maintainers from README 2017-07-05 15:37:23 -07:00
Owen Mehegan 5145ce4833 Sort IDs in changelog numerically 2017-07-05 15:36:39 -07:00
Daumantas Stulgis e534da2d9b Fixed test 2017-07-06 01:34:08 +03:00
Owen Mehegan 3fc051c37c [maven-release-plugin] prepare for next development iteration 2017-07-05 15:08:05 -07:00
Owen Mehegan caa8379de2 [maven-release-plugin] prepare release gitlab-plugin-1.4.6 2017-07-05 15:07:56 -07:00
Daumantas Stulgis 895209bc9e Merge remote-tracking branch 'default/master' into downstream_build_support
# Conflicts:
#	src/main/java/com/dabsquared/gitlabjenkins/util/CommitStatusUpdater.java
2017-07-06 01:04:35 +03:00
Owen Mehegan ee11fa53c4 Update CHANGELOG for v1.4.6. 2017-07-05 15:04:12 -07:00
Owen Mehegan fd4132e947 Merge pull request #559 from roidelapluie/JENKINS-44517
JENKINS-44517 Add a function to (re)set the Gitlab connections for bootstrapping new Jenkins installs
2017-07-05 14:13:59 -07:00
Owen Mehegan f1ac0a0a8a Merge pull request #572 from ElijahLynn/patch-1
Link to GitLab commit status API in README
2017-06-30 14:05:28 -07:00
Elijah Lynn dd578d0d55 Link to GitLab commit status API in README 2017-06-29 18:43:44 -07:00
milena a8c40ff4ec Merge pull request #1 from mreichel/bugfixSecureDefaults
#427 Plugin should have secure defaults
2017-06-20 11:03:12 +02:00