summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make sure everyone has shared/lfs-objectssplit-up-buildsDouwe Maan2015-12-091-0/+0
|
* Merge branch 'master' into split-up-buildsDouwe Maan2015-12-0950-273/+1626
|\
| * Merge branch 'fix-workhorse-upgrade-info' into 'master' Jacob Vosmaer2015-12-091-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Remove the prepended v on GitLab Workhorse upgrade doc Fix for https://gitlab.com/gitlab-org/gitlab-workhorse/issues/4 See merge request !2020
| | * Remove the prepended v on GitLab Workhorse upgrade docfix-workhorse-upgrade-infoKelvin2015-12-081-1/+1
| | |
| * | Merge branch 'merge-if-green' into 'master' Douwe Maan2015-12-0938-158/+715
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge when build succeeds ### What does this MR do? Adds a button to a MR when the build/ci is running so it can be merged when/if the build is successfull. ### Are there points in the code the reviewer needs to double check? English spelling and whether or not the grammer is correct. ### Why was this MR needed? When you expect its all good, and don't want to revisit the current MR it can be accepted allready. ### What are the relevant issue numbers / Feature requests? Fixes #2640 -- although `Merge if green` is replaced with `Merge when the build succeeds` the general idea is the same. ### Screenshots (if relevant) ![Screenshot_from_2015-12-07_10-34-39](/uploads/b90b558b6ad6c8266bc9c96120d86f96/Screenshot_from_2015-12-07_10-34-39.png) ![Screenshot_from_2015-11-02_17-26-56](/uploads/9f52f56e3c5e9ec63cb8f42978c92a52/Screenshot_from_2015-11-02_17-26-56.png) ![Screenshot_from_2015-11-02_17-27-03](/uploads/119fc18c9b15ff73dc38010ac5b6244a/Screenshot_from_2015-11-02_17-27-03.png) ![Screenshot_from_2015-12-03_10-08-14](/uploads/bad7b35c7d129981d43631877c958be0/Screenshot_from_2015-12-03_10-08-14.png) ![Screenshot_from_2015-11-02_17-27-16](/uploads/b616d750a16cc11ba72f2ca84213515e/Screenshot_from_2015-11-02_17-27-16.png) ### Further considerations What if there are minor things needed solving, e.g. Rubocop, the current implementation will reset the approved status of the MR. It might be a consideration keep the approval for team member, or even guests. This would require an extra option in the Admin screen, though might add extra value. #### TODO - [x] Docs - [x] Specs /cc @DouweM @rspeicher See merge request !1729
| | * | Tweak specsmerge-if-greenDouwe Maan2015-12-091-8/+2
| | | |
| | * | Give merge request widget the vars it desiresDouwe Maan2015-12-091-0/+5
| | | |
| | * | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-0949-232/+377
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # config/routes.rb
| | * | | Tweak text of documentationDouwe Maan2015-12-082-4/+3
| | | | |
| | * | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-0879-261/+955
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/merge_requests/widget/_heading.html.haml # app/views/projects/merge_requests/widget/open/_accept.html.haml
| | * \ \ \ Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-0817-22/+148
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Rewrite docsDouwe Maan2015-12-086-12/+8
| | | | | |
| | * | | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-0889-319/+917
| | |\ \ \ \
| | * | | | | Satisfy Douwe MaanZeger-Jan van de Weg2015-12-073-10/+8
| | | | | | |
| | * | | | | Fix commit message textarea positionZeger-Jan van de Weg2015-12-071-31/+32
| | | | | | |
| | * | | | | Prevent Firefox from remembering hidden field valueZeger-Jan van de Weg2015-12-071-1/+1
| | | | | | |
| | * | | | | Fix specsZeger-Jan van de Weg2015-12-071-4/+4
| | | | | | |
| | * | | | | Fix schemaZeger-Jan van de Weg2015-12-071-5/+8
| | | | | | |
| | * | | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-07520-4387/+7500
| | |\ \ \ \ \
| | * | | | | | Button fixZeger-Jan van de Weg2015-12-076-9/+34
| | | | | | | |
| | * | | | | | Incorporate feedbackZeger-Jan van de Weg2015-12-0514-83/+134
| | | | | | | |
| | * | | | | | Doc feature Merge When Build SucceedsZeger-Jan van de Weg2015-12-023-0/+20
| | | | | | | |
| | * | | | | | Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-0218-65/+268
| | | | | | | |
| | * | | | | | Refactor MergeWhenBuildSucceedsService and incorporate feedbackZeger-Jan van de Weg2015-11-2311-54/+52
| | | | | | | |
| | * | | | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-18528-2855/+8972
| | |\ \ \ \ \ \
| | * | | | | | | API support, incorporated feedbackZeger-Jan van de Weg2015-11-1815-63/+157
| | | | | | | | |
| | * | | | | | | MRs author can cancel automatic mergeZeger-Jan van de Weg2015-11-022-3/+5
| | | | | | | | |
| | * | | | | | | Merge when build succeedsZeger-Jan van de Weg2015-11-0217-20/+219
| | | | | | | | |
| * | | | | | | | Merge branch 'ci-services-docs' into 'master' Achilleas Pipinellis2015-12-0911-114/+910
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce CI documentation for services and languages This introduces guide for PHP, a bunch of services (databases) and cleans up some docker references. With this there are bunch of example projects in https://gitlab.com/groups/gitlab-examples. /cc @JobV @axil See merge request !1917
| | * | | | | | | Use the name of the linked containers instead of localhostci-services-docsAchilleas Pipinellis2015-12-082-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1917#note_2833978
| | * | | | | | | More clean up to the CI example on how to use docker images [ci skip]Achilleas Pipinellis2015-12-081-64/+36
| | | | | | | | |
| | * | | | | | | Use the latest docker image in mysql CI example [ci skip]Achilleas Pipinellis2015-12-081-1/+1
| | | | | | | | |
| | * | | | | | | More postgres CI service example cleanupAchilleas Pipinellis2015-12-081-20/+35
| | | | | | | | |
| | * | | | | | | More redis CI example clean upAchilleas Pipinellis2015-12-081-6/+7
| | | | | | | | |
| | * | | | | | | Fix wrong naming of services keyword [ci skip]Achilleas Pipinellis2015-12-081-1/+1
| | | | | | | | |
| | * | | | | | | Add note about the various phpenv toolsAchilleas Pipinellis2015-12-081-0/+8
| | | | | | | | |
| | * | | | | | | Add link to runners doc [ci skip]Achilleas Pipinellis2015-12-081-3/+3
| | | | | | | | |
| | * | | | | | | Clean up mysql CI exampleAchilleas Pipinellis2015-12-081-47/+90
| | | | | | | | |
| | * | | | | | | Clean up postgres CI example [ci skip]Achilleas Pipinellis2015-12-081-45/+71
| | | | | | | | |
| | * | | | | | | More cleanup on Redis exampleAchilleas Pipinellis2015-12-081-4/+4
| | | | | | | | |
| | * | | | | | | Clean up Redis CI service example [ci skip]Achilleas Pipinellis2015-12-081-22/+50
| | | | | | | | |
| | * | | | | | | Add an intro to CI services documentation [ci skip]Achilleas Pipinellis2015-12-081-1/+4
| | | | | | | | |
| | * | | | | | | Move markdown link to the bottom [ci skip]Achilleas Pipinellis2015-12-081-4/+5
| | | | | | | | |
| | * | | | | | | Clean up CI ssh keys docs [ci skip]Achilleas Pipinellis2015-12-081-86/+81
| | | | | | | | |
| | * | | | | | | Use link instead of connect to be more Docker friendlyAchilleas Pipinellis2015-12-081-1/+1
| | | | | | | | |
| | * | | | | | | Clean up PHP CI example [ci skip]Achilleas Pipinellis2015-12-081-114/+211
| | | | | | | | |
| | * | | | | | | Add intro about languagesAchilleas Pipinellis2015-12-081-0/+4
| | | | | | | | |
| | * | | | | | | Fix wrong exampleAchilleas Pipinellis2015-12-081-1/+1
| | | | | | | | |
| | * | | | | | | Bring back removed heading and point to other sectionAchilleas Pipinellis2015-12-081-0/+4
| | | | | | | | |
| | * | | | | | | Clean up using_docker_images.mdAchilleas Pipinellis2015-12-081-83/+185
| | | | | | | | |
View Lorry Controller Status