tiagonbotelho
1d268a89de
adds second batch of tests changed to active tense
2016-08-09 15:11:39 +01:00
Stan Hu
60529e0216
Properly abort a merge when merge conflicts occur
...
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
2016-07-29 11:21:21 -07:00
Robert Speicher
adc6ec4a9c
Avoid describe-ing symbols in specs
2016-07-12 10:27:58 -05:00
Valery Sizov
926a8ab476
Handle custom Git hook result in GitLab UI
2016-07-04 20:16:55 +03:00
Jeroen Jacobs
7880a300dc
Allows MR authors to have the source branch removed when merging the MR
2016-05-20 11:30:03 +02:00
Douwe Maan
73c59de062
Merge branch 'master' into split-up-builds
2015-12-09 13:56:26 +01:00
Douwe Maan
a2cfb44157
Tag service specs
2015-12-09 11:55:49 +01:00
Zeger-Jan van de Weg
0e96d6eb10
Merge branch 'master' into merge-if-green
2015-12-07 10:06:07 +01:00
Zeger-Jan van de Weg
a7682f8775
Specs for 'Merge When Build Succeeds'
2015-12-02 13:27:16 +01:00
Valery Sizov
f1504e1ad5
test fix
2015-11-30 18:03:07 +02:00
Valery Sizov
05fdd12fd9
Improve error message when merging fails
2015-10-01 09:45:47 +03:00
Dmitriy Zaporozhets
3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c82f706fbd23
2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f416b9dbe9f5a
2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets
ab8c71de4e
Fix merge request creation without branch selected
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-05 11:03:41 +02:00
Jeroen van Baarsen
0c4a70a306
Updated rspec to rspec 3.x syntax
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-02-12 19:17:35 +01:00
jubianchi
4ffdb83e71
Add action property to merge request hook
2015-01-20 10:50:24 +01:00
