summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js
Commit message (Collapse)AuthorAgeFilesLines
* Fix removes source branch text being rendered in merged stateremoves-source-branch-widget-statePhil Hughes2018-03-121-0/+1
|
* Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-051-0/+3
| | | | | | | | | | | | | | When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
* Remove related links in MR widget when empty stateClement Ho2017-12-191-0/+17
|
* Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-2/+2
|
* Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4dwinh2017-06-211-0/+13
| | | | | This reverts commit 6ac777a7592533d9c7b3682b2b9ca8caccca3f4d, reversing changes made to 025cbc2ad4dc175634676ff8a6955e043512d8bf.
* Adjust position and wording for related issues in merge requestsWinnie Hellmann2017-06-191-13/+0
|
* add sha-mismatch state to mr-widget to prevent accidental merges when branch ↵Mike Greiling2017-05-111-0/+1
| | | | unknowingly changes
* Merge request widget redesignFatih Acet2017-05-091-0/+36