Commits · 61a1bdd7cc9fa01261e6bfc4630699b256b1f48b · projects.thm.de / GitLab

17 Dec, 2015 1 commit
- Revert sidebar position for issue and merge request · 4b7c9c7f
  Dmitriy Zaporozhets authored Dec 17, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4b7c9c7f
16 Dec, 2015 1 commit
- Rename .issuable-details to .detail-page (and -header and -description) · 79c90821
  Douwe Maan authored Dec 16, 2015
  
  79c90821
15 Dec, 2015 1 commit
- Fix clipboard buttons on MR instructions and Commit#show · f49ac5c8
  Robert Speicher authored Dec 15, 2015
  
  f49ac5c8
11 Dec, 2015 2 commits
- Move awards back to gray panel and few improvements to sidebar · 19118114
  Dmitriy Zaporozhets authored Dec 11, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  19118114
- Implement new sidebar for merge request page · c6c24431
  Dmitriy Zaporozhets authored Dec 10, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c6c24431
08 Dec, 2015 2 commits
- Add Builds tab to MR detail page · 1567572e
  Douwe Maan authored Dec 08, 2015
  
  1567572e
- Reduce MR/issue duplication · 1b5302f8
  Douwe Maan authored Dec 08, 2015
  
  1b5302f8
02 Dec, 2015 2 commits
- Remove duplicated styling for center top menus · 3ad1d320
  Douwe Maan authored Dec 02, 2015
  
  3ad1d320
- Use "opened by" instead of "created by" in issue/MR header, like in list · e3233016
  Douwe Maan authored Dec 02, 2015
  
  e3233016
13 Nov, 2015 1 commit

Add ignore white space option in merge request diff · 3d0efa8e

Minsik Yoon authored Oct 22, 2015

fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393).

Add ignore whitespace optoin to Commits Compare view

3d0efa8e

06 Nov, 2015 1 commit
- Small UI improvements to merge request page · c5ec2a23
  Dmitriy Zaporozhets authored Nov 06, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c5ec2a23
23 Oct, 2015 1 commit
- Add clipboard buttons to each step of "How to merge" · 80108725
  Robert Speicher authored Oct 23, 2015
  
  80108725
14 Oct, 2015 2 commits
- Cache rendered contents of issues, MRs and notes · 925dc592
  Douwe Maan authored Oct 14, 2015
  
  925dc592
- Use Gitlab::Markdown.render with :pipeline option rather than different methods · ed41333a
  Douwe Maan authored Oct 14, 2015
  
  ed41333a
08 Sep, 2015 1 commit
- Escape user-provided content in preserved HAML sections · 9f31f95a
  Douwe Maan authored Sep 08, 2015
  
  9f31f95a
07 Sep, 2015 1 commit
- Small restyle of issue and merge request pages · 243bfc97
  Dmitriy Zaporozhets authored Sep 07, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  243bfc97
11 Aug, 2015 4 commits

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

Dmitriy Zaporozhets authored Aug 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

Revert "Merge branch 'revert-satellites' into 'master' · 3e259ea8
Dmitriy Zaporozhets authored Aug 11, 2015
```
This reverts commit 5daf44b7, reversing
changes made to 2f706fbd.
```
3e259ea8
Revert "Merge branch 'improve-merge-requests' into 'master' · 84727fba
Dmitriy Zaporozhets authored Aug 11, 2015
```
This reverts commit 4773f38e, reversing
changes made to 0d5d80b7.
```
84727fba
Revert "Merge branch 'mr-widget-text' into 'master' · f293d991
Dmitriy Zaporozhets authored Aug 11, 2015
```
This reverts commit 151d9fb3, reversing
changes made to 819d110c.
```
f293d991

08 Aug, 2015 1 commit
- Improve text in MR "How To Merge" modal. · b2334da4
  Douwe Maan authored Aug 08, 2015
  
  b2334da4
07 Aug, 2015 1 commit

Link mr commits/diffs to target project · fe4b0652

Dmitriy Zaporozhets authored Aug 07, 2015

Now when changes in merge requests stored in target project we can
always link commits and diffs to target project. So even people without
access to fork can browse commits and diffs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

fe4b0652

30 Jul, 2015 1 commit
- Show who last edited a comment if it wasn't the original author · 36bd6c84
  Douwe Maan authored Jul 30, 2015
  
  36bd6c84
26 Jun, 2015 1 commit

Rename abilities to correspond contoller/model action names · 342d5537

Dmitriy Zaporozhets authored Jun 26, 2015

write_ was renamed to create_
modify_  was renamed to update_

So now in update action we have next code

def create
  can?(current_user, :create_issue, @issue)
end

def update
  can?(current_user, :update_issue, @issue)
end
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

342d5537

25 Jun, 2015 1 commit
- Refactor issue and merge request sidebar · 2d31568b
  Dmitriy Zaporozhets authored Jun 25, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2d31568b
24 Jun, 2015 1 commit

Improve performance for merge_request#show page · a3f64b19

Dmitriy Zaporozhets authored Jun 24, 2015

* store @participants in variable
* store result of subscribed? call into variable

In total it reduce amount of SQL queries for merge_request with 10
comments/participants twice.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

a3f64b19

19 Jun, 2015 1 commit

Revert merge request states renaming · 7524d7c0

Dmitriy Zaporozhets authored Jun 18, 2015

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

7524d7c0

16 Jun, 2015 1 commit
- Bootlint: Modals no longer need a '.hide' class · e3c1818a
  Robert Speicher authored Jun 15, 2015
  
  e3c1818a
11 Jun, 2015 1 commit
- Refactor accept merge request widget · 644b6ba9
  Dmitriy Zaporozhets authored Jun 11, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  644b6ba9
05 Jun, 2015 1 commit
- Add info about WIP merge requests to docs. · bdfd163a
  Douwe Maan authored Jun 05, 2015
  
  bdfd163a
01 Jun, 2015 1 commit
- Show avatars in merge widget and fix mr download button overflow · 38bac5d7
  Dmitriy Zaporozhets authored Jun 01, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  38bac5d7
27 May, 2015 1 commit
- Some language improvements · 2fa3af04
  Stefan Tatschner authored Apr 24, 2015
  
  2fa3af04
25 May, 2015 1 commit
- Consistently refer to MRs as either Accepted or Rejected. · ebe9c890
  Douwe Maan authored May 25, 2015
  
  ebe9c890
22 May, 2015 1 commit
- Use the user list from the target project in a merge request · 7a7ce701
  Stan Hu authored May 19, 2015
```
Closes #1535
```
  7a7ce701
15 May, 2015 1 commit
- Add explanation about WIP status to MR form. · c74375ae
  Douwe Maan authored May 15, 2015
  
  c74375ae
14 May, 2015 1 commit
- Spin icon next to "Checking for CI status..." · 0b098060
  Douwe Maan authored May 14, 2015
  
  0b098060
06 May, 2015 4 commits
- Don't add js-task-list-container to things the user can't edit · 725ff58b
  Robert Speicher authored Apr 29, 2015
  
  725ff58b
- Single quotes/icon helper in views · 5c7b91e2
  Robert Speicher authored Apr 29, 2015
  
  5c7b91e2
- Remove all references to `parse_tasks` · 6883e6e0
  Robert Speicher authored Apr 29, 2015
  
  6883e6e0
- Update task list behavior for Merge Requests · ce29e5cd
  Robert Speicher authored Apr 29, 2015
  
  ce29e5cd