Commits · 0e96d6eb10f92f14d9c06e1728b1a3597a856d2a · Jérome Perrin / gitlab-ce

An error occurred fetching the project authors.

04 Dec, 2015 1 commit
- Ensure "Remove Source Branch" button is not shown when branch is being deleted. #3583 · aa1ba009
  Rubén Dávila authored 9 years ago
  
  aa1ba009
02 Dec, 2015 2 commits
- Link to branches from MR "Request to merge X into Y" sentence · 1df2908b
  Douwe Maan authored 9 years ago
  
  1df2908b
- Specs for 'Merge When Build Succeeds' · a7682f87
  Zeger-Jan van de Weg authored 9 years ago
  
  a7682f87
10 Nov, 2015 1 commit
- Replace CoffeeScript block into JavaScript in Views. · 18cb430f
  Jason Lee authored 9 years ago
```
For example view: shared/issuable/_context

CoffeeScript: 190ms
JavaScript: 19.7ms
```
  18cb430f
22 Sep, 2015 1 commit
- Fix error when MR source branch no longer exists. · d80750b5
  Douwe Maan authored 9 years ago
  
  d80750b5
11 Aug, 2015 3 commits

Merge branch 'mr-widget-text' into 'master' · 91836272

Dmitriy Zaporozhets authored 9 years ago

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

91836272

Revert "Merge branch 'revert-satellites' into 'master' · 3e259ea8
Dmitriy Zaporozhets authored 9 years ago
```
This reverts commit 5daf44b7, reversing
changes made to 2f706fbd.
```
3e259ea8
Revert "Merge branch 'mr-widget-text' into 'master' · f293d991
Dmitriy Zaporozhets authored 9 years ago
```
This reverts commit 151d9fb3, reversing
changes made to 819d110c.
```
f293d991

08 Aug, 2015 1 commit
- Improve MR merge widget text and UI consistency. · b8590da0
  Douwe Maan authored 9 years ago
  
  b8590da0
19 Jun, 2015 1 commit

Revert merge request states renaming · 7524d7c0

Dmitriy Zaporozhets authored 9 years ago

Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

7524d7c0

11 Jun, 2015 3 commits
- Extract merge request widget JS to separate class · 00600a59
  Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  00600a59
- Refactor merge request widget step 2 · d2d8037b
  Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d2d8037b
- Refactor accept merge request widget · 644b6ba9
  Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  644b6ba9