Commit graph

16 commits

Author SHA1 Message Date
GitLab Bot
5ff1b520ba Add latest changes from gitlab-org/gitlab@master 2019-10-14 09:07:54 +00:00
Igor
6a385b60f8 Remove mergeTrain from FE since it's used only in EE 2019-08-22 13:50:19 +00:00
Nathan Friend
35ae9d8a74
Add merge train support to MR merge button (CE)
This commit updates the merge request widget's "Merge" button to
support merge trains.
2019-06-11 09:27:51 -05:00
George Tsiolis
579fa8b8ec Rename CI related selectors 2019-04-16 12:57:07 +03:00
Winnie Hellmann
514ee63826 Move some tests from Karma to Jest 2019-03-23 17:53:46 +01:00
Phil Hughes
81a52c27c3
Correctly show rebase state in MR widget
Correctly shows the rebase state even if a merge requests pipeline
has failed.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/45942
2019-01-10 12:37:42 +00:00
Sam Bigelow
78f70545ea Set cached MRWidget SHA after rebase
Update changelog to include Merge Request ID and Author

Update changelog to include Merge Request ID and Author
2018-12-14 09:44:54 -05:00
Johann Hubert Sonntagbauer
6f5723a169 enable jasmine/new-line-before-expect 2018-10-17 06:57:29 +02:00
Clement Ho
0a0a62c936 Remove related links in MR widget when empty state 2017-12-19 17:50:38 +00:00
Eric Eastwood
5ecfd3cd0f Fix MR widget with external CI services/integrations
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33287

The MR widget was trying to render the pipelines section when
there are no GitLab CI pipelines which was throwing some NPE
errors.
2017-09-18 18:06:39 -05: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
Fatih Acet
468f91686c MRWidget: Change order of if blocks to determine widget state properly. 2017-05-24 00:10:39 +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
Fatih Acet
0151325dac Merge request widget redesign 2017-05-09 04:15:34 +00:00