Douwe Maan
|
1711a384e4
|
Prevent “This merge request contains merge conflicts” from being shown after resolution because of slow background workers
|
2016-08-12 23:24:50 +03:00 |
|
Phil Hughes
|
22e97dd702
|
Fixed issue with MR buttons being in a group
Also removed some inline code
|
2016-06-13 11:46:53 +01:00 |
|
Douwe Maan
|
b016d4356d
|
Also show Revert and Cherry-pick when the source branch can't be removed
|
2016-04-20 14:28:34 +02:00 |
|
Rubén Dávila
|
5ef3f80d41
|
More updates from the last code review.
|
2016-02-19 13:15:42 -05:00 |
|
Rubén Dávila
|
169070ba4b
|
Some updates from last code review.
|
2016-02-19 13:14:54 -05:00 |
|
Rubén Dávila
|
d958d027dc
|
Make #commit_with_hooks return the new obj id plus some other fixes.
|
2016-02-19 13:14:54 -05:00 |
|
Rubén Dávila
|
d34733efc4
|
Don't show revert button if commit/MR has already been reverted.
|
2016-02-19 13:14:54 -05:00 |
|
Rubén Dávila
|
e8d15f1339
|
Refactor revert_commit_link helper.
|
2016-02-19 13:14:54 -05:00 |
|
Rubén Dávila
|
477ae66b4d
|
Move revert link to the MR widget section plus some refactor.
|
2016-02-19 13:14:53 -05:00 |
|
Zeger-Jan van de Weg
|
ffa12a7f82
|
Remove extra spaces after branchname
|
2015-12-18 11:16:08 +01:00 |
|
Zeger-Jan van de Weg
|
b1fc531344
|
Fix typo
|
2015-12-10 18:19:49 +01:00 |
|
Zeger-Jan van de Weg
|
0e96d6eb10
|
Merge branch 'master' into merge-if-green
|
2015-12-07 10:06:07 +01:00 |
|
Rubén Dávila
|
aa1ba00936
|
Ensure "Remove Source Branch" button is not shown when branch is being deleted. #3583
|
2015-12-04 10:43:33 -05:00 |
|
Douwe Maan
|
1df2908b27
|
Link to branches from MR "Request to merge X into Y" sentence
|
2015-12-02 14:23:41 +01:00 |
|
Zeger-Jan van de Weg
|
a7682f8775
|
Specs for 'Merge When Build Succeeds'
|
2015-12-02 13:27:16 +01:00 |
|
Jason Lee
|
18cb430f79
|
Replace CoffeeScript block into JavaScript in Views.
For example view: shared/issuable/_context
CoffeeScript: 190ms
JavaScript: 19.7ms
|
2015-11-10 19:17:37 +08:00 |
|
Douwe Maan
|
d80750b50f
|
Fix error when MR source branch no longer exists.
|
2015-09-22 17:49:45 +02:00 |
|
Dmitriy Zaporozhets
|
91836272fe
|
Merge branch 'mr-widget-text' into 'master'
Improve text of MR merge widget and manual merge modal
Modal with manual merge instructions:
![Screen_Shot_2015-08-08_at_21.30.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2bffe42e9ad76afd02efbe5816027767/Screen_Shot_2015-08-08_at_21.30.23.png)
Archived:
![archived](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e1efa1d54ce7ead8de6e88ca34095c09/archived.png)
WIP:
![wip](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14a831458d0946722559ec643f91678c/wip.png)
Missing target branch:
![missing_branch](https://gitlab.com/gitlab-org/gitlab-ce/uploads/340083bbacbc234906e58cf76c586a9e/missing_branch.png)
Missing source branch:
![missing_branch_source](https://gitlab.com/gitlab-org/gitlab-ce/uploads/72f80ed58efed88b2bbcf403b55b1a01/missing_branch_source.png)
Nothing to merge:
![nothing](https://gitlab.com/gitlab-org/gitlab-ce/uploads/85b0d9da87acacd53cffd0df58d8eed4/nothing.png)
Checking ability to merge:
![check](https://gitlab.com/gitlab-org/gitlab-ce/uploads/32d75322e622025610c446e8ca7d892d/check.png)
Conflicts when allowed to merge:
![conflicts](https://gitlab.com/gitlab-org/gitlab-ce/uploads/23fdb2c60a27d873b3cc8a008203eb59/conflicts.png)
Conflicts when not allowed to merge:
![conflicts_not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/113462a80fc65bf48b20dc0efd808363/conflicts_not_allowed.png)
Mergeable when allowed to merge:
![accept](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1b3bb1a71df21728fe9318e7a083bfba/accept.png)
Mergeable when not allowed to merge:
![not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d38fa5c96f8f9d7223bb6bc7ad36f29d/not_allowed.png)
Merge in progress:
![locked](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b60dcf5eb70e6032b0e8aac766018df3/locked.png)
Merge failed:
![failed_2](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3713b9a10298183935b028b658271ac9/failed_2.png)
Merged:
![merged](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7f68a48dd197a71351c9a80c59c8ecbe/merged.png)
Closed:
![closed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d5ce040449b7db943bd2fbfffb607a10/closed.png)
cc @dzaporozhets @rspeicher
See merge request !1120
|
2015-08-11 19:24:50 +02:00 |
|
Dmitriy Zaporozhets
|
f293d991a4
|
Revert "Merge branch 'mr-widget-text' into 'master'
"
This reverts commit 151d9fb35f , reversing
changes made to 819d110cab .
|
2015-08-11 10:26:12 +02:00 |
|
Douwe Maan
|
b8590da024
|
Improve MR merge widget text and UI consistency.
|
2015-08-08 21:24:43 +02:00 |
|
Dmitriy Zaporozhets
|
7524d7c082
|
Revert merge request states renaming
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-06-19 17:09:50 +02:00 |
|
Dmitriy Zaporozhets
|
00600a592b
|
Extract merge request widget JS to separate class
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-06-11 18:27:03 +02:00 |
|
Dmitriy Zaporozhets
|
d2d8037b1a
|
Refactor merge request widget step 2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-06-11 15:14:50 +02:00 |
|
Dmitriy Zaporozhets
|
644b6ba993
|
Refactor accept merge request widget
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-06-11 09:40:26 +02:00 |
|