Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix bug when trying to cache closed issues from external issue trackersissue_22446 | Felipe Artur | 2016-10-03 | 1 | -0/+36 |
| | |||||
* | Close todos when accepting a MR via the API. | Tony Gambone | 2016-09-29 | 1 | -0/+24 |
| | |||||
* | adds second batch of tests changed to active tenseactive-tense-test-coverage | tiagonbotelho | 2016-08-09 | 1 | -2/+2 |
| | |||||
* | Properly abort a merge when merge conflicts occurreject-merge-conflicts | Stan Hu | 2016-07-29 | 1 | -0/+11 |
| | | | | | | | | | | | If somehow a user attempted to accept a merge request that had conflicts (e.g. the "Accept Merge Request" button or the MR itself was not updated), `MergeService` did not properly detect that a conflict occurred. It would assume that the MR went through without any issues and close the MR as though everything was fine. This could cause data loss if the source branch were removed. Closes #20425 | ||||
* | Avoid `describe`-ing symbols in specsrs-describe-symbols | Robert Speicher | 2016-07-12 | 1 | -1/+1 |
| | |||||
* | Handle custom Git hook result in GitLab UI | Valery Sizov | 2016-07-04 | 1 | -0/+10 |
| | |||||
* | Allows MR authors to have the source branch removed when merging the MR | Jeroen Jacobs | 2016-05-20 | 1 | -0/+15 |
| | |||||
* | Merge branch 'master' into split-up-builds | Douwe Maan | 2015-12-09 | 1 | -4/+5 |
|\ | |||||
| * | Merge branch 'master' into merge-if-green | Zeger-Jan van de Weg | 2015-12-07 | 1 | -1/+3 |
| |\ | |||||
| * | | Specs for 'Merge When Build Succeeds' | Zeger-Jan van de Weg | 2015-12-02 | 1 | -4/+4 |
| | | | |||||
* | | | Tag service specs | Douwe Maan | 2015-12-09 | 1 | -1/+1 |
| |/ |/| | |||||
* | | test fix | Valery Sizov | 2015-11-30 | 1 | -2/+3 |
|/ | |||||
* | Improve error message when merging failsmr_improve_errors_handling | Valery Sizov | 2015-10-01 | 1 | -0/+14 |
| | |||||
* | Revert "Merge branch 'revert-satellites' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 1 | -5/+0 |
| | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c. | ||||
* | Revert "Merge branch 'drop-satellites'" | Dmitriy Zaporozhets | 2015-08-11 | 1 | -0/+5 |
| | | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Fix merge request creation without branch selected | Dmitriy Zaporozhets | 2015-08-05 | 1 | -5/+0 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Updated rspec to rspec 3.x syntax | Jeroen van Baarsen | 2015-02-12 | 1 | -6/+6 |
| | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | ||||
* | Add action property to merge request hook | jubianchi | 2015-01-20 | 1 | -0/+44 |