summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/merge.js.haml
Commit message (Expand)AuthorAgeFilesLines
* Don't allow merges with new commitsSean McGivern2016-06-011-0/+3
* Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-071-2/+2
|\
| * Ensure "Remove Source Branch" button is not shown when branch is being delete...Rubén Dávila2015-12-041-1/+1
* | Merge when build succeedsZeger-Jan van de Weg2015-11-021-1/+5
|/
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-0/+6
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-6/+0
* Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-161-0/+6