summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/widget/open
Commit message (Expand)AuthorAgeFilesLines
* 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-012-6/+6
* Fix job to pipeline renamingFilipa Lacerda2017-02-101-1/+1
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-033-5/+5
|\
| * Merge branch '17662-rename-builds' into 'master' Kamil Trzciński2017-02-031-2/+2
| |\
| | * Fix broken tests17662-rename-buildsFilipa Lacerda2017-02-031-2/+2
| * | Backport changes from EE squashSean McGivern2017-02-032-3/+3
| |/
* | fix test failure for merge request widgetMike Greiling2017-01-281-1/+1
* | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-271-0/+3
|\ \ | |/
| * Load ci_bundle javascripts in MWBS partialGrzegorz Bizon2017-01-211-0/+3
* | migrate all javascript asset bundles and require syntaxMike Greiling2017-01-102-2/+2
|/
* HAMLLint: Fix `TrailingWhitespace` offencesKushal Pandya2016-12-312-2/+2
* Replace link to Resolve conflicts with buttons21135-resolve-these-conflicts-link-is-too-subtleSam Rose2016-12-281-14/+16
* Move javascript for widget check to ci_bundle.Bryce Johnson2016-12-211-6/+3
* 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
* Feature: delegate all open discussions to IssueBob Van Landuyt2016-12-051-1/+5
* Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-251-1/+1
|\
| * If Build running change accept merge request when build succeeds button from ...Dimitrie Hoekstra2016-11-181-1/+1
* | Rename MWPS in user interface and feature testsGrzegorz Bizon2016-11-211-2/+2
* | Rename MWPS in system notes and related testsGrzegorz Bizon2016-11-211-1/+1
|/
* Add setting to only allow merge requests to be merged when all discussions ar...Rodolfo Santos2016-11-041-0/+6
* Replace bootstrap caret with fontawesome caretClement Ho2016-10-051-1/+1
* Show tooltip when conflicts cannot be resolved through GitLabDouwe Maan2016-08-121-1/+7
* Verify user is signed in and can actually resolve conflictsDouwe Maan2016-08-121-3/+5
* Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?`Douwe Maan2016-08-121-1/+1
* Don't allow resolving invalid conflictsSean McGivern2016-08-121-3/+3
* Make resolve these conflicts text a link to conflicts tab.Fatih Acet2016-08-121-1/+4
* Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-181-1/+1
* Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-131-1/+1
* Don't ask the user to "merge this request manually".Timothy Andrew2016-07-131-1/+1
* Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-062-2/+2
* Allow or not merge MR with failed buildRui Anderson2016-06-102-13/+20
* Merge branch 'merge-conflicts-icon-color' into 'master' Jacob Schatz2016-06-091-2/+2
|\
| * Use warning color merge conflicts icon in MR status widget.merge-conflicts-icon-colorFatih Acet2016-06-061-2/+2
* | Rename all ci_commit[s] in application code to pipeline[s]Kamil Trzcinski2016-06-031-2/+2
|/
* fixup! Don't allow merges with new commits14139-sha-parameter-in-accept-merge-request-apiSean McGivern2016-06-021-2/+2
* Don't allow merges with new commitsSean McGivern2016-06-013-1/+8
* Allows MR authors to have the source branch removed when merging the MRJeroen Jacobs2016-05-203-5/+9
* Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-181-1/+1
|\
| * Change `js-quick-submit` behavior to expect the class on the formRobert Speicher2016-03-021-1/+1
* | Improve the "easy WIP & un-WIP from link" featureRémy Coutable2016-03-181-8/+8
* | Easily (un)mark merge request as WIP using linkDouwe Maan2016-02-261-1/+7
|/
* 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
* Minor fix in flow 'Merge when build succeeds'Zeger-Jan van de Weg2015-12-111-1/+1
* Merge branch 'master' into merge-if-greenDouwe Maan2015-12-082-4/+3
|\
| * Get ci_commit in MR controllerDouwe Maan2015-12-081-1/+1
* | Fix commit message textarea positionZeger-Jan van de Weg2015-12-071-31/+32
View Lorry Controller Status