提交 · e849b51cae8956c9d4eebe9c42804443a55edb83 · 李少辉-开发者 / gitlab-foss

10 11月, 2015 1 次提交
- J
  Replace CoffeeScript block into JavaScript in Views. · 18cb430f
  由 Jason Lee 提交于 11月 10, 2015
```
For example view: shared/issuable/_context

CoffeeScript: 190ms
JavaScript: 19.7ms
```
  18cb430f
23 10月, 2015 1 次提交
- D
  Render CI status on merge requests index page · fe6ec80e
  由 Dmitriy Zaporozhets 提交于 10月 23, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fe6ec80e
16 10月, 2015 1 次提交
- K
  
  Fix missing commit status for widget when no CI service is enabled · 6909b309
  由 Kamil Trzcinski 提交于 10月 16, 2015
  
  6909b309
06 10月, 2015 1 次提交

Use CI commit status for merge request widget · e6ab50a7

由 Dmitriy Zaporozhets 提交于 10月 06, 2015

For temporary compatibility with other services like Jenkins we ask for
CI status via AJAX request if there is no commit status in GitLab
database
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

e6ab50a7

21 9月, 2015 3 次提交
- K
  
  Fixed MR handling when GitLab CI project is not present · ca6fd0a2
  由 Kamil Trzcinski 提交于 9月 21, 2015
  
  ca6fd0a2
- K
  Revert "Fixed MR handling when GitLab CI project is not present" · abaa65ef
  由 Kamil Trzcinski 提交于 9月 21, 2015
```
This reverts commit 3abcab77.
```
  abaa65ef
- K
  
  Fixed MR handling when GitLab CI project is not present · 3abcab77
  由 Kamil Trzcinski 提交于 9月 21, 2015
  
  3abcab77
12 8月, 2015 2 次提交

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

由 Dmitriy Zaporozhets 提交于 8月 10, 2015

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

D
Refactor merge request widget · 48e76c04
由 Dmitriy Zaporozhets 提交于 8月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
48e76c04

11 8月, 2015 3 次提交
- D
  Revert "Merge branch 'revert-satellites' into 'master' · 3e259ea8
  由 Dmitriy Zaporozhets 提交于 8月 11, 2015
```
This reverts commit 5daf44b7, reversing
changes made to 2f706fbd.
```
  3e259ea8
- D
  Revert "Merge branch 'improve-merge-requests' into 'master' · 84727fba
  由 Dmitriy Zaporozhets 提交于 8月 11, 2015
```
This reverts commit 4773f38e, reversing
changes made to 0d5d80b7.
```
  84727fba
- D
  Revert "Merge branch 'mr-widget-text' into 'master' · f293d991
  由 Dmitriy Zaporozhets 提交于 8月 11, 2015
```
This reverts commit 151d9fb3, reversing
changes made to 819d110c.
```
  f293d991
09 8月, 2015 2 次提交
- D
  
  More textual tweaks · 78fba275
  由 Douwe Maan 提交于 8月 09, 2015
  
  78fba275
- D
  
  Improve MR merge widget text and UI consistency. · b8590da0
  由 Douwe Maan 提交于 8月 08, 2015
  
  b8590da0
07 8月, 2015 1 次提交
- D
  Refactor merge request widget · 3cf4a981
  由 Dmitriy Zaporozhets 提交于 8月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3cf4a981
04 8月, 2015 1 次提交
- K
  
  Added support for CI skipped status · 427b5df2
  由 Kamil Trzcinski 提交于 7月 30, 2015
  
  427b5df2
23 6月, 2015 1 次提交
- V
  
  Explicit error when commit not found in the GitLab CI · af93d447
  由 Valery Sizov 提交于 6月 23, 2015
  
  af93d447
12 6月, 2015 1 次提交
- D
  Extract merge request widget JS to separate class · 00600a59
  由 Dmitriy Zaporozhets 提交于 6月 11, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  00600a59
11 6月, 2015 2 次提交
- D
  Refactor merge request widget step 2 · d2d8037b
  由 Dmitriy Zaporozhets 提交于 6月 11, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d2d8037b
- D
  Refactor accept merge request widget · 644b6ba9
  由 Dmitriy Zaporozhets 提交于 6月 11, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  644b6ba9