李少辉-开发者 / gitlab-foss

15

0

0

代码
- 文件
- 提交
- 分支
- Tags
- 贡献者
- 分支图
- Diff
Issue 0
- 列表
- 看板
- 标记
- 里程碑
合并请求 0
Wiki 0
- Wiki
分析
- 仓库
- DevOps
项目成员
Pages

体验新版 GitCode，发现更多精彩内容 >>

07 11月, 2015 1 次提交
- B
  
  Merge button has color from CI status · e3490437
  由 Baldinof 提交于 11月 06, 2015
  
  e3490437
23 10月, 2015 1 次提交
- R
  
  Add clipboard buttons to each step of "How to merge" · 80108725
  由 Robert Speicher 提交于 10月 23, 2015
  
  80108725
09 10月, 2015 1 次提交
- S
  
  Make diff file view easier to use on mobile screens · b5d9a613
  由 Stan Hu 提交于 10月 08, 2015
  
  b5d9a613
07 10月, 2015 1 次提交
- A
  
  Fixes to dropdown, font colors for new project and merge request · 7ad4521f
  由 Andrey 提交于 10月 05, 2015
  
  7ad4521f
08 9月, 2015 3 次提交
- D
  Style merge request page · e9cf79da
  由 Dmitriy Zaporozhets 提交于 9月 08, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e9cf79da
- D
  Improve font size on issues/mr list · 1240a7e0
  由 Dmitriy Zaporozhets 提交于 9月 08, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1240a7e0
- D
  Style issue page, comments and part of merge request page · 6887075b
  由 Dmitriy Zaporozhets 提交于 9月 08, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6887075b
03 9月, 2015 1 次提交
- D
  Change some base colors in UI · aeeb31d6
  由 Dmitriy Zaporozhets 提交于 9月 03, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  aeeb31d6
12 8月, 2015 3 次提交

D

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
D
Move command line insturction out of mr widget · 3e0ba775
由 Dmitriy Zaporozhets 提交于 8月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
3e0ba775

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
  
  Make modal narrower · e6bf9aa7
  由 Douwe Maan 提交于 8月 09, 2015
  
  e6bf9aa7
- D
  
  Add "Check out branch" button to the MR page. · 9049cdff
  由 Douwe Maan 提交于 8月 08, 2015
  
  9049cdff
08 8月, 2015 1 次提交
- D
  Add more spacing between MR widget and tabs · 71158b11
  由 Dmitriy Zaporozhets 提交于 8月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  71158b11
07 8月, 2015 2 次提交
- D
  Move command line insturction out of mr widget · fd2f907b
  由 Dmitriy Zaporozhets 提交于 8月 07, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fd2f907b
- 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
11 6月, 2015 1 次提交
- D
  Refactor merge request widget step 2 · d2d8037b
  由 Dmitriy Zaporozhets 提交于 6月 11, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d2d8037b
01 6月, 2015 2 次提交
- D
  Better margin for header in accept MR widget · ed7f42fd
  由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ed7f42fd
- D
  Improve UI for accept MR widget · 584ac316
  由 Dmitriy Zaporozhets 提交于 6月 01, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  584ac316
24 4月, 2015 1 次提交

S

Tweak merge requests · 4beb295b

由 Stefan Tatschner 提交于 4月 21, 2015

* Include creation time
* Include author without avatar
* Move assignee to the right
* Include comments counter by default, gray it out when there are 0
  comments.

4beb295b

25 3月, 2015 1 次提交
- D
  
  Change merge request button color based on CI status · 35ec08a6
  由 Dmitriy Zaporozhets 提交于 3月 24, 2015
  
  35ec08a6
20 3月, 2015 1 次提交
- V
  
  add canceled CI status · 19032c03
  由 Valery Sizov 提交于 3月 19, 2015
  
  19032c03
19 3月, 2015 1 次提交
- D
  
  Refactor select css. Make selects same width · e25b1107
  由 Dmitriy Zaporozhets 提交于 3月 18, 2015
  
  e25b1107
18 3月, 2015 1 次提交
- D
  
  More actively use css variabled to prevent colors duplication · d659c1d1
  由 Dmitriy Zaporozhets 提交于 3月 17, 2015
  
  d659c1d1
14 3月, 2015 2 次提交
- D
  
  Return some merge widget styles and make it more compact · 9b445c68
  由 Dmitriy Zaporozhets 提交于 3月 14, 2015
  
  9b445c68
- D
  
  Use sass variabled for backgroung and border colors · dffa2fa9
  由 Dmitriy Zaporozhets 提交于 3月 13, 2015
  
  dffa2fa9
10 3月, 2015 1 次提交
- D
  
  Increate default font-size from 13 to 14px · 9720240b
  由 Dmitriy Zaporozhets 提交于 3月 09, 2015
  
  9720240b
07 3月, 2015 2 次提交
- D
  
  Better name for pages css dir · 887cf5c7
  由 Dmitriy Zaporozhets 提交于 3月 06, 2015
  
  887cf5c7
- D
  
  Refactor gitlab css state colors · cd73b26e
  由 Dmitriy Zaporozhets 提交于 3月 06, 2015
  
  cd73b26e
20 2月, 2015 2 次提交
- D
  
  Improve issue and merge request lists UI · 692aa783
  由 Dmitriy Zaporozhets 提交于 2月 19, 2015
  
  692aa783
- D
  
  Update bootstrap-sass gem · ee26dae6
  由 Dmitriy Zaporozhets 提交于 2月 19, 2015
  
  ee26dae6
18 2月, 2015 2 次提交
- D
  
  Fix MR labels css · a04ac761
  由 Dmitriy Zaporozhets 提交于 2月 18, 2015
  
  a04ac761
- D
  
  Affix assignee/milestone block · 896c0462
  由 Dmitriy Zaporozhets 提交于 2月 17, 2015
  
  896c0462
29 1月, 2015 1 次提交
- D
  
  Improve UX for widget if merge request can not be merged · b40809d7
  由 Dmitriy Zaporozhets 提交于 1月 28, 2015
  
  b40809d7
16 1月, 2015 1 次提交
- D
  
  Increase font size for lists · 3d3c7efa
  由 Dmitriy Zaporozhets 提交于 1月 15, 2015
  
  3d3c7efa
12 1月, 2015 1 次提交
- M
  Rename the checkbox css class to prevent it from being overwritten by the same... · 0a089661
  由 Marin Jankovski 提交于 1月 12, 2015
```
Rename the checkbox css class to prevent it from being overwritten by the same named bootstrap class.
```
  0a089661