Commit Graph

23 Commits

Author SHA1 Message Date
Oswaldo Ferreira 0640b3d1d8 Store MergeWorker JID on merge request, and clean up stuck merges 2017-08-07 15:23:37 -03:00
Simon Knox bce029a23b clean up merge request widget UI 2017-08-07 13:20:33 +10:00
Tim Zallmann 9aa2205a15 Resolve "Memory usage notice doesn't link anywhere" 2017-07-26 09:31:17 +00:00
Clement Ho 6eeb638434 Make commits behind text a link to the target branch commits page 2017-07-11 11:49:22 -05:00
Kamil Trzciński 9786e4fb0a Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'"
This reverts merge request !12127
2017-07-06 10:45:24 +00:00
winh 1fc9262e3d Handle Promise rejections in mr_widget_pipeline_spec.js 2017-06-26 17:43:29 +02:00
winh 07742c0254 Add failing test for #32987 2017-06-22 10:06:58 +02:00
winh 40eb825368 Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"
This reverts commit 6ac777a759, reversing
changes made to 025cbc2ad4.
2017-06-21 15:25:11 +02:00
Winnie Hellmann ef4bc6df04 Adjust position and wording for related issues in merge requests 2017-06-19 22:17:00 +00:00
Kushal Pandya 069783b5cc Add performance deltas between app deployments on Merge Request widget 2017-05-29 15:04:47 +00:00
Bryce Johnson 095fa89b95 Don't use getElementById in specs. 2017-05-22 20:49:26 -04:00
Bryce Johnson a25fb52916 Upgrade Remove Source Branch checkbox UX. 2017-05-22 13:56:13 -04:00
Kushal Pandya a4014a4cc8 Refine MR widget styling for buttons and info text 2017-05-19 17:08:07 +00:00
Fatih Acet 48a4a934c4 Address MR comments. 2017-05-16 15:11:55 +03:00
Fatih Acet 9f80007904 MRWidget: Fix specs and address WIP comments. 2017-05-16 15:11:55 +03:00
Filipa Lacerda 8f47540ab8 Merge branch 'acet-mr-widget-fix-link' into 'master'
MRWidget: Fix target branch link.

See merge request !11267
2017-05-12 12:36:10 +00:00
Fatih Acet 2a8686353a Merge branch '32178-prevent-merge-on-sha-change' into 'master'
Add "SHA mismatch" state to the MR widget

Closes #32178

See merge request !11316
2017-05-12 12:03:20 +00:00
Filipa Lacerda a1348a5d29 Uniform CI status components in vue 2017-05-12 11:28:26 +00:00
Fatih Acet dd70776f67 MRWidget: Use targetBranchPath in everywhere. 2017-05-12 08:40:15 +03:00
Mike Greiling 9bcf95bda0 add test for sha-mismatch state component 2017-05-11 18:11:43 -05:00
Fatih Acet 5d7d509840 MRWidget: Fix target branch link. 2017-05-12 01:20:55 +03:00
kushalpandya f66006169b Add Prometheus memory sparkline to MR widget 2017-05-09 19:30:22 +05:30
Fatih Acet 0151325dac Merge request widget redesign 2017-05-09 04:15:34 +00:00