Commits · 2b48da22ca63e7594c3b956201974e54e2566550 · Léo-Paul Géneau / gitlab-ce

An error occurred fetching the project authors.

03 Jun, 2016 1 commit
- Rename all ci_commit[s] in application code to pipeline[s] · 1927a2d3
  Kamil Trzcinski authored 8 years ago
  
  1927a2d3
08 May, 2016 1 commit
- Fix build notification on merge request page change even if the build status didn't change · ed2a7a1e
  Benedikt Huss authored 8 years ago
  
  ed2a7a1e
21 Mar, 2016 1 commit
- Updated based on feedback · c767f35c
  Phil Hughes authored 8 years ago
  
  c767f35c
18 Mar, 2016 2 commits
- Updated to fix issues risen during feedback · 3d6573fd
  Phil Hughes authored 8 years ago
```
Correctly updates the on-screen CI text feedback
```
  3d6573fd
- Adds notifications API to MR page. · f7e21099
  Jacob Schatz authored 9 years ago
```
When a build status changes a notification will popup.
Fixes #10851
```
  f7e21099
08 Dec, 2015 3 commits
- Change text of MR widget heading · c767d0e6
  Douwe Maan authored 9 years ago
  
  c767d0e6
- Add Builds tab to MR detail page · 1567572e
  Douwe Maan authored 9 years ago
  
  1567572e
- Get ci_commit in MR controller · 9907a7e6
  Douwe Maan authored 9 years ago
  
  9907a7e6
05 Dec, 2015 1 commit
- Incorporate feedback · 2462a96e
  Zeger-Jan van de Weg authored 9 years ago
  
  2462a96e
02 Dec, 2015 1 commit
- "CI build passed", not "CI build success" · e718bab9
  Douwe Maan authored 9 years ago
  
  e718bab9
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
23 Oct, 2015 1 commit
- Render CI status on merge requests index page · fe6ec80e
  Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fe6ec80e
16 Oct, 2015 1 commit
- Fix missing commit status for widget when no CI service is enabled · 6909b309
  Kamil Trzcinski authored 9 years ago
  
  6909b309
06 Oct, 2015 1 commit

Use CI commit status for merge request widget · e6ab50a7

Dmitriy Zaporozhets authored 9 years ago

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: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

e6ab50a7

21 Sep, 2015 3 commits
- Fixed MR handling when GitLab CI project is not present · ca6fd0a2
  Kamil Trzcinski authored 9 years ago
  
  ca6fd0a2
- Revert "Fixed MR handling when GitLab CI project is not present" · abaa65ef
  Kamil Trzcinski authored 9 years ago
```
This reverts commit 3abcab77.
```
  abaa65ef
- Fixed MR handling when GitLab CI project is not present · 3abcab77
  Kamil Trzcinski authored 9 years ago
  
  3abcab77
11 Aug, 2015 5 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

Refactor merge request widget · 48e76c04
Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
48e76c04
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 'improve-merge-requests' into 'master' · 84727fba
Dmitriy Zaporozhets authored 9 years ago
```
This reverts commit 4773f38e, reversing
changes made to 0d5d80b7.
```
84727fba
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

09 Aug, 2015 1 commit
- More textual tweaks · 78fba275
  Douwe Maan authored 9 years ago
  
  78fba275
08 Aug, 2015 1 commit
- Improve MR merge widget text and UI consistency. · b8590da0
  Douwe Maan authored 9 years ago
  
  b8590da0
07 Aug, 2015 1 commit
- Refactor merge request widget · 3cf4a981
  Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3cf4a981
04 Aug, 2015 1 commit
- Added support for CI skipped status · 427b5df2
  Kamil Trzcinski authored 9 years ago
  
  427b5df2
23 Jun, 2015 1 commit
- Explicit error when commit not found in the GitLab CI · af93d447
  Valery Sizov authored 9 years ago
  
  af93d447
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