summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/components/states
Commit message (Expand)AuthorAgeFilesLines
* Fix MR ready to merge buttons/controls at mobile breakpoint37259-some-mr-ready-mobile-fixesEric Eastwood2017-09-131-3/+3
* Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-2/+2
* clean up merge request widget UISimon Knox2017-08-0718-411/+479
* Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4dwinh2017-06-211-10/+0
* Adjust position and wording for related issues in merge requestsWinnie Hellmann2017-06-191-0/+10
* Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-a...Fatih Acet2017-05-261-2/+6
|\
| * Upgrade Remove Source Branch checkbox UX.Bryce Johnson2017-05-221-2/+6
* | MR widget styling fixes32657-fix-mr-widget-styleskushalpandya2017-05-221-1/+1
|/
* Refine MR widget styling for buttons and info textKushal Pandya2017-05-191-1/+1
* MRWidget: Make error message bold and red.mr-widget-refresh-failedFatih Acet2017-05-191-1/+1
* MRWidget: Change refresh button place in failed state.Fatih Acet2017-05-191-3/+3
* MRWidget: Add refresh button into MR widget failed state.Fatih Acet2017-05-191-0/+26
* Address MR comments.acet-mr-widget-nothing-to-commit-stateFatih Acet2017-05-161-1/+0
* MRWidget: Fix specs and address WIP comments.Fatih Acet2017-05-161-7/+4
* MRWidget: Implement new design for nothing to commit state.Fatih Acet2017-05-161-11/+40
* Merge branch 'acet-mr-widget-fix-link' into 'master' Filipa Lacerda2017-05-123-3/+3
|\
| * MRWidget: Use targetBranchPath in everywhere.acet-mr-widget-fix-linkFatih Acet2017-05-121-1/+1
| * MRWidget: Fix target branch link.Fatih Acet2017-05-122-2/+2
* | add sha-mismatch state to mr-widget to prevent accidental merges when branch ...Mike Greiling2017-05-111-0/+16
|/
* Merge request widget redesignFatih Acet2017-05-0918-0/+982