Commit graph

24 commits

Author SHA1 Message Date
Winnie Hellmann
ef4bc6df04 Adjust position and wording for related issues in merge requests 2017-06-19 22:17:00 +00:00
Fatih Acet
ebd6e5f351 Merge branch '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gone' into 'master'
Resolve "Browser notifications for pipeline running in a MR is gone"

Closes #32916

See merge request !11734
2017-05-30 11:40:21 +00:00
Kushal Pandya
069783b5cc Add performance deltas between app deployments on Merge Request widget 2017-05-29 15:04:47 +00:00
Fatih Acet
8968171c9e Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master'
Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form

Closes #32447 and #32907

See merge request !11558
2017-05-26 19:42:02 +00:00
Luke "Jared" Bennett
870005c432
Added specs for handleNotifications in mr_widget_options_spec.js 2017-05-26 16:48:19 +01:00
Fatih Acet
468f91686c MRWidget: Change order of if blocks to determine widget state properly. 2017-05-24 00:10:39 +03: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
Fatih Acet
5460153c9f Merge branch '32536-mr-widget-performance-improvements' into 'master'
Load improvements related to MR widget

See merge request !11518
2017-05-19 19:52:45 +00:00
Kushal Pandya
a4014a4cc8 Refine MR widget styling for buttons and info text 2017-05-19 17:08:07 +00:00
Oswaldo Ferreira
92cdf78dcf Fix Karma expect 2017-05-18 21:17:36 -03:00
Oswaldo Ferreira
7efa0aa02c Remove unnecessary initial request 2017-05-18 20:41:30 -03: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
0945fa0430 ensure hasSHAChanged == true when setData includes a different SHA from constructor 2017-05-11 18:48:15 -05:00
Mike Greiling
f19ec4e2ae ensure the correct state component is loaded when hasSHAChanged == true 2017-05-11 18:47:27 -05: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