summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/widget/open/_accept.html.haml
Commit message (Expand)AuthorAgeFilesLines
* Merge request widget redesignFatih Acet2017-05-091-50/+0
* Added tests and fixed a typoJose Ivan Vargas2017-04-101-1/+1
* Fix typo on the class merge-when-pipeline_succeedsJose Ivan Vargas2017-04-101-1/+1
* Fixed button capitalisation for Projects in viewsJose Ivan Vargas Lopez2017-04-061-5/+5
* Fix link togglers jumping to topEric Eastwood2017-03-281-1/+1
* Default to subtle MR mege button until CI status is available28010-mr-merge-button-default-to-dangerEric Eastwood2017-03-021-6/+4
* Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-011-4/+4
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-031-2/+2
|\
| * Backport changes from EE squashSean McGivern2017-02-031-2/+2
* | migrate all javascript asset bundles and require syntaxMike Greiling2017-01-101-1/+1
|/
* Backport moving MR widget CI JS out of script tag.Bryce Johnson2016-12-211-18/+3
* backend completely drives creation of merge commit messageGabriel Gizotti2016-12-161-1/+2
* Add toggle links for using default message and description on change merge co...Gabriel Gizotti2016-12-161-0/+1
* Rename MWPS in user interface and feature testsGrzegorz Bizon2016-11-211-2/+2
* Replace bootstrap caret with fontawesome caretClement Ho2016-10-051-1/+1
* Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-061-1/+1
* Allow or not merge MR with failed buildRui Anderson2016-06-101-13/+14
* Rename all ci_commit[s] in application code to pipeline[s]Kamil Trzcinski2016-06-031-2/+2
* Don't allow merges with new commitsSean McGivern2016-06-011-0/+1
* Allows MR authors to have the source branch removed when merging the MRJeroen Jacobs2016-05-201-1/+4
* Change `js-quick-submit` behavior to expect the class on the formRobert Speicher2016-03-021-1/+1
* Fix merge widget JS for buttonsfix-merge-immediately-buttonDouwe Maan2015-12-161-10/+8
* Fix updating and disabling merge button when Merge Immediately is clickedDouwe Maan2015-12-161-4/+4
* Merge branch 'master' into merge-if-greenDouwe Maan2015-12-081-2/+2
|\
| * Get ci_commit in MR controllerDouwe Maan2015-12-081-1/+1
* | 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
* | Button fixZeger-Jan van de Weg2015-12-071-4/+29
* | Incorporate feedbackZeger-Jan van de Weg2015-12-051-2/+1
* | Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-021-2/+2
* | Refactor MergeWhenBuildSucceedsService and incorporate feedbackZeger-Jan van de Weg2015-11-231-1/+1
* | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-181-8/+12
|\ \ | |/
| * Replace CoffeeScript block into JavaScript in Views.Jason Lee2015-11-101-5/+6
| * Merge button has color from CI statusBaldinof2015-11-061-1/+3
* | API support, incorporated feedbackZeger-Jan van de Weg2015-11-181-1/+1
* | Merge when build succeedsZeger-Jan van de Weg2015-11-021-5/+13
|/
* Style merge request pageDmitriy Zaporozhets2015-09-081-1/+1
* Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-171-1/+0
|\
| * Move merge manually text below merge widgetDmitriy Zaporozhets2015-08-111-1/+0
| * Merge branch 'mr-widget-text' into 'master' Dmitriy Zaporozhets2015-08-111-3/+3
| * Refactor merge request widgetDmitriy Zaporozhets2015-08-111-6/+0
* | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-10/+4
|/
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-1/+1
* Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets2015-08-111-0/+6
* Revert "Merge branch 'mr-widget-text' into 'master' "Dmitriy Zaporozhets2015-08-111-3/+3
* Improve MR merge widget text and UI consistency.Douwe Maan2015-08-081-3/+3
* Refactor merge request widgetDmitriy Zaporozhets2015-08-071-6/+0
* Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-161-1/+1
* Remove disableButtonIf[Any]EmptyField calls from formsRobert Speicher2015-06-261-3/+1
* Extract merge request widget JS to separate classDmitriy Zaporozhets2015-06-111-4/+8