Commit Graph

1112 Commits

Author SHA1 Message Date
Daniel Brooks f5e1dcf851 [maven-release-plugin] prepare release gitlab-plugin-1.1.13 2015-01-27 11:08:03 -08:00
bassrock cf0ae24a02 Merge pull request #48 from kasper-f/mergeRequestFromTargetRepo
Fixed #47 by changing to use the target repo id instead of the source id
2015-01-27 11:05:47 -08: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
Daniel Brooks 076b4f1ed8 [maven-release-plugin] prepare for next development iteration 2015-01-26 23:40:33 -08:00
Daniel Brooks 603029052a [maven-release-plugin] prepare release gitlab-plugin-1.1.12 2015-01-26 23:40:28 -08:00
Daniel Brooks db25c2c934 Fixing release 2015-01-26 23:39:54 -08:00
bassrock 8a9468afeb Merge pull request #46 from DABSquared/develop
Develop
2015-01-26 23:35:14 -08: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
Daniel Brooks 656b144ced Fixing the maven release 2015-01-26 23:18:39 -08:00
Daniel Brooks 4f05de69a2 [maven-release-plugin] prepare for next development iteration 2015-01-26 22:55:26 -08:00
Daniel Brooks 4349fba547 [maven-release-plugin] prepare release gitlab-plugin-1.1.10 2015-01-26 22:55:21 -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
Daniel Brooks 994e617f74 [maven-release-plugin] prepare for next development iteration 2015-01-26 14:26:00 -08:00
Daniel Brooks 4b6f83eae9 Merge branch 'master' of github.com:jenkinsci/gitlab-plugin
Conflicts:
	pom.xml
2015-01-26 14:25:42 -08:00
Daniel Brooks 165faf4681 [maven-release-plugin] prepare release gitlab-plugin-1.1.9 2015-01-26 14:23:28 -08:00
Daniel Brooks 4476b0385c Updating Pom to use the mvn release 2.5.1 2015-01-26 14:20:58 -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
bassrock 3ded0d61cd Merge pull request #45 from kasper-f/fixImageLoading
Fixed #28 "Build status icon toggling"
2015-01-26 13:31:09 -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 df81c95b13 [maven-release-plugin] prepare for next development iteration 2014-12-30 19:10:59 +01:00
Dimitris Stafylarakis 826c59ad31 [maven-release-plugin] prepare release gitlab-plugin-1.1.7 2014-12-30 19:10:55 +01:00
Dimitris Stafylarakis 5af24665a2 add packaging tag to pom.xml 2014-12-30 19:09:37 +01:00
Dimitris Stafylarakis f7f8c63d6e [maven-release-plugin] prepare for next development iteration 2014-12-30 06:36:05 +01:00
Dimitris Stafylarakis f721e91640 [maven-release-plugin] prepare release gitlab-plugin-1.1.6 2014-12-30 06:36:01 +01:00
Dimitris Stafylarakis afb4130237 force maven-release-plugin to version 2.5 2014-12-30 06:35:04 +01:00
Dimitris Stafylarakis c2344ebd5e Bump to version 1.1.6 2014-12-30 06:11:01 +01:00
Dimitris Stafylarakis ce15760fc8 Bump to version 1.1.5 2014-12-28 23:31:02 +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
xaniasd ab471952d4 Merge pull request #35 from kasper-f/check_merge_request_on_push
Check merge request on push
2014-12-21 08:53:09 +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
xaniasd ca2cec4d56 Merge pull request #34 from kasper-f/correct_gitlab_merge_number
Found that the id from the ObjectAttribute dit not point to the id of th...
2014-12-20 15:15:17 +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