Commits · 6ae6f29a2ebc4540b5b3b790b19976ab3763ed53 · nexedi / gitlab-ce

An error occurred fetching the project authors.

04 Apr, 2016 2 commits
- SCSS colors into variables · 51df9360
  Phil Hughes authored 8 years ago
  
  51df9360
- Logged out box · 3b4c4dd7
  Phil Hughes authored 8 years ago
  
  3b4c4dd7
27 Mar, 2016 1 commit
- fix right sidebar overllaping build section in merge request · feee6dab
  Arinde Eniola authored 8 years ago
  
  feee6dab
15 Mar, 2016 1 commit
- Follow the CSS Style Guide rules for HEX colors. · e03d0b28
  connorshea authored 8 years ago
```
Use lowercase letters and shorthand values for HEX colors where
possible.

Discussed in #14299.
```
  e03d0b28
26 Feb, 2016 1 commit
- Refactor styles for merge requests list · d51f3b7b
  Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d51f3b7b
22 Feb, 2016 1 commit
- removed merge-request-no-votes css class · 7bdddb48
  Phil Hughes authored 9 years ago
  
  7bdddb48
19 Feb, 2016 2 commits
- Some updates from last code review. · 169070ba
  Rubén Dávila authored 9 years ago
  
  169070ba
- Reuser revert commit modal in MR detail page. · 4dc83505
  Rubén Dávila authored 9 years ago
  
  4dc83505
17 Feb, 2016 1 commit
- Add ability to see and sort on vote count from Issues and MR lists · 9823d00e
  Douglas Barbosa Alexandre authored 9 years ago
  
  9823d00e
20 Jan, 2016 2 commits
- Uses color variables instead. · a7f2d75c
  Jacob Schatz authored 9 years ago
  
  a7f2d75c
- Adds disabled comment field and disabled avatar. · 3278c5b0
  Jacob Schatz authored 9 years ago
  
  3278c5b0
14 Jan, 2016 1 commit
- Improve the consistency of commit titles, branch names, tag names, issue/MR... · 818607f0
  Rémy Coutable authored 9 years ago
```
Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages
```
  818607f0
13 Jan, 2016 1 commit
- Replace all navigation menu with nav-links class · 03090a88
  Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  03090a88
15 Dec, 2015 1 commit
- Fix clipboard buttons on MR instructions and Commit#show · f49ac5c8
  Robert Speicher authored 9 years ago
  
  f49ac5c8
11 Dec, 2015 1 commit
- Implement new sidebar for merge request page · c6c24431
  Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c6c24431
08 Dec, 2015 2 commits
- Change text of MR widget heading · c767d0e6
  Douwe Maan authored 9 years ago
  
  c767d0e6
- Render monospace text at 90% of the parent font-size · 3eb20912
  Douwe Maan authored 9 years ago
  
  3eb20912
03 Dec, 2015 1 commit
- Fix specs · e5c865ee
  Douwe Maan authored 9 years ago
  
  e5c865ee
02 Dec, 2015 3 commits
- Remove duplicated styling for center top menus · 3ad1d320
  Douwe Maan authored 9 years ago
  
  3ad1d320
- Use gl-padding instead of 15px/20px where appropriate · 3ae7dba9
  Douwe Maan authored 9 years ago
  
  3ae7dba9
- Remove unnecesary wrapper elements · 9bad736f
  Douwe Maan authored 9 years ago
  
  9bad736f
06 Nov, 2015 1 commit
- Merge button has color from CI status · e3490437
  Baldinof authored 9 years ago
  
  e3490437
02 Nov, 2015 1 commit
- Merge when build succeeds · 77f8a1e3
  Zeger-Jan van de Weg authored 9 years ago
  
  77f8a1e3
23 Oct, 2015 1 commit
- Add clipboard buttons to each step of "How to merge" · 80108725
  Robert Speicher authored 9 years ago
  
  80108725
09 Oct, 2015 1 commit
- Make diff file view easier to use on mobile screens · b5d9a613
  Stan Hu authored 9 years ago
  
  b5d9a613
07 Oct, 2015 1 commit
- Fixes to dropdown, font colors for new project and merge request · 7ad4521f
  Andrey authored 9 years ago
  
  7ad4521f
08 Sep, 2015 2 commits
- Style merge request page · e9cf79da
  Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e9cf79da
- Improve font size on issues/mr list · 1240a7e0
  Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1240a7e0
07 Sep, 2015 1 commit
- Style issue page, comments and part of merge request page · 6887075b
  Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6887075b
03 Sep, 2015 1 commit
- Change some base colors in UI · aeeb31d6
  Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  aeeb31d6
11 Aug, 2015 6 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
Move command line insturction out of mr widget · 3e0ba775
Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
3e0ba775
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
- Make modal narrower · e6bf9aa7
  Douwe Maan authored 9 years ago
  
  e6bf9aa7
08 Aug, 2015 1 commit
- Add "Check out branch" button to the MR page. · 9049cdff
  Douwe Maan authored 9 years ago
  
  9049cdff
07 Aug, 2015 2 commits
- Add more spacing between MR widget and tabs · 71158b11
  Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  71158b11
- Move command line insturction out of mr widget · fd2f907b
  Dmitriy Zaporozhets authored 9 years ago
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fd2f907b