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

07 12月, 2015 2 次提交
- V
  
  fixes after review · 3c97cbc7
  由 Valery Sizov 提交于 12月 07, 2015
  
  3c97cbc7
- V
  
  fox specs · 5df2c441
  由 Valery Sizov 提交于 12月 07, 2015
  
  5df2c441
04 12月, 2015 33 次提交

V

Add added, modified and removed properties to commit object in webhook · 5c1b49f4
由 Valery Sizov 提交于 12月 04, 2015

5c1b49f4
D

Merge branch 'extend-events-api' · 4de7f32c
由 Dmitriy Zaporozhets 提交于 12月 04, 2015

4de7f32c
D
Merge branch 'mr-commits-api' into 'master' · 1f5a6eb2
由 Dmitriy Zaporozhets 提交于 12月 04, 2015
```
Add API endpoint to fetch merge request commits list

Fixes #3748 

See merge request !1984
```
1f5a6eb2
M
Merge branch 'fix_mailer_queue' into 'master' · 0c377a79
由 Marin Jankovski 提交于 12月 04, 2015
```
Fix mailers queue

The `mailer` queue can be removed.

See merge request !1975
```
0c377a79

由 Dmitriy Zaporozhets 提交于 12月 04, 2015

* add note to Events API
* add author section to Events API
* add noteable_id and noteable_type to Notes API
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

3227a5ea

D
Improve docs · c366e81d
由 Dmitriy Zaporozhets 提交于 12月 04, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
c366e81d
D
Add API endpoint to fetch merge request commits list · 0b68a0e7
由 Dmitriy Zaporozhets 提交于 12月 04, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
0b68a0e7
D
Fix wrong doc in merge request API · 0ccd7de7
由 Dmitriy Zaporozhets 提交于 12月 04, 2015
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
0ccd7de7

Merge branch 'ui/sidebar' into 'master' · abf54f23

由 Dmitriy Zaporozhets 提交于 12月 04, 2015

UI: Sidebar & header tweaks and fixes

Depends on !1953 

See the commits for more details, the messages mostly speak for themselves.

![Logo](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ba088150165bb0a0aea1e894f3443f43/logo_tooltip.png)

![Sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1e8c09ac3bf489cdb9531eebea18c90/sidebar_tooltips.png)

Fixes #2928, #2071, https://dev.gitlab.org/gitlab/gitlabhq/issues/2575, and https://dev.gitlab.org/gitlab/gitlabhq/issues/2573

See merge request !1958

abf54f23

Merge branch 'ui/form-consistency' into 'master' · eb9601d9

由 Dmitriy Zaporozhets 提交于 12月 04, 2015

UI: Improve form consistency

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

# Highlights

## Tag form

Before:

![tag_before](/uploads/ee5ba6ef405749013f9e5717ebcf72f3/tag_before.png)

After:

![tag_after](/uploads/71bb543553190d91c03fd706cce35923/tag_after.png)


See merge request !1955

eb9601d9

D
Merge branch 'ui/login-page' into 'master' · de3a1754
由 Dmitriy Zaporozhets 提交于 12月 04, 2015
```
Fix background and padding of login and error pages

Was gray, is white again.

See merge request !1978
```
de3a1754

Merge branch 'doc-ssh' into 'master' · 14010b9e

由 Achilleas Pipinellis 提交于 12月 04, 2015

Correction of markdown in SSH docs

Correction of broken markdown in SSH docs

See merge request !1900

14010b9e

R
Merge branch 'fork-event' into 'master' · e9d06903
由 Robert Speicher 提交于 12月 03, 2015
```
Don't show project fork event as imported

See merge request !1949
```
e9d06903

Merge branch 'new-tag-branch-authorization' into 'master' · 05d5485d

由 Robert Speicher 提交于 12月 03, 2015

Add authorization to new branch/tag pages.

The create actions have authorization, the new actions didn't,
so no-one unauthorized could actually do anything, but it was wrong(TM).

See merge request !1979

05d5485d

R
Merge branch 'fix-ruby-version' into 'master' · bcf74d6e
由 Robert Speicher 提交于 12月 03, 2015
```
Update .ruby-version to 2.1.7

Fixes #3835

See merge request !1980
```
bcf74d6e
K
Merge branch 'ci_docker_docs' into 'master' · 95fd7983
由 Kamil Trzciński 提交于 12月 03, 2015
```
fixes #3263 slashes are replaced with two underscores



See merge request !1981
```
95fd7983
K

fixes #3263 slashes are replaced with two underscores · 387e5656
由 Kevin Pankonen 提交于 12月 03, 2015

387e5656
R

Update .ruby-version to 2.1.7 · 83e6d829
由 Robert Schilling 提交于 12月 03, 2015

83e6d829

Merge branch 'issue_3468_broken_link' into 'master' · 1481255e

由 Drew Blessing 提交于 12月 03, 2015

Fixed invalid link on starred projects dashboard.

Fixes #3468

The MR fixes 'Project' links on a dashboard pages headers. See the issue for the details.

This MR does not include tests since the change is rather trivial and there are no (as far as I have seen) existing tests for checking links validity.

In case tests are required I would like to get some guidance on the implementation first. At least I would like to know what should be covered: changed links, all header links, all navigation?

See merge request !1926

1481255e

Merge branch 'ui/wiki' into 'master' · abb72618

由 Dmitriy Zaporozhets 提交于 12月 03, 2015

UI: Use new style for wiki

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

# Highlights

## Wiki Page

Before:

![Screen_Shot_2015-12-02_at_17.48.45](/uploads/aa53f768b8760f2e15d765e06d5ff773/Screen_Shot_2015-12-02_at_17.48.45.png)

After:

![Screen_Shot_2015-12-02_at_17.48.16](/uploads/f8a376651aff9c8de82621578aaeb002/Screen_Shot_2015-12-02_at_17.48.16.png)

## Edit Wiki Page

Before:

![Screen_Shot_2015-12-02_at_17.48.59](/uploads/c9ffddaca3156046b99cba11bdb0ea4f/Screen_Shot_2015-12-02_at_17.48.59.png)

After:

![Screen_Shot_2015-12-02_at_17.48.26](/uploads/1aa62049f120c91436ed68fd7441c156/Screen_Shot_2015-12-02_at_17.48.26.png)

See merge request !1967

abb72618

Merge branch 'ui/new-project' into 'master' · e7452c6b

由 Dmitriy Zaporozhets 提交于 12月 03, 2015

UI: New Project form tweaks

Depends on !1953 

See the commits for more details, the messages mostly speak for themselves.

Before:

![Screen_Shot_2015-12-02_at_17.43.23](/uploads/302e734f6796a85a9f4be9c2f494869d/Screen_Shot_2015-12-02_at_17.43.23.png)

After:

![Screen_Shot_2015-12-02_at_17.44.11](/uploads/411980e53a4f87cf0a04e5bcb7329f82/Screen_Shot_2015-12-02_at_17.44.11.png)


See merge request !1964

e7452c6b

Merge branch 'ui/issuable-filter' into 'master' · 805b4cf5

由 Dmitriy Zaporozhets 提交于 12月 03, 2015

UI: Issuable filter tweaks

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

# Highlights

## Filter bar

Before:

![filter_before](/uploads/b061be7521c6d5babb77c7d12e77f65e/filter_before.png)

After:

![filter_after](/uploads/aadfbcd77caf1b49fde8ca6d781f1004/filter_after.png)

## Bulk edit bar

Before:

![bulk_before](/uploads/849c98224e1f335c65c0de5616bbcdae/bulk_before.png)

After:

![bulk_after](/uploads/185d29116663f9f663acab76d328096f/bulk_after.png)


See merge request !1963

805b4cf5

Merge branch 'bugfix/star_cache' into 'master' · 15ea1285

由 Dmitriy Zaporozhets 提交于 12月 03, 2015

Touch project when toggling stars to update cache

This is a fix for gitlab-org/gitlab-ce#3513.

When a star toggle event happens, we touch project to clear cache key.
This will trigger a new "updated_at" at the project model. If it's undesirable, please let me know and I will try to solve it in a different way.

See merge request !1970

15ea1285

A
Fixed invalid link on starred projects dashboard. · c5b6b31c
由 Anton Baklanov 提交于 11月 18, 2015
```
Fixes #3468
```
c5b6b31c
G

Touch project when toggling stars to update cache · 82e916b0
由 Gabriel Mazetto 提交于 12月 01, 2015

82e916b0
D

Fix spec · 494ebad3
由 Douwe Maan 提交于 12月 03, 2015

494ebad3
D

Add authorization to new branch/tag pages. · a89d6d14
由 Douwe Maan 提交于 12月 03, 2015

a89d6d14
D

Fix background and padding of login and error pages · 1dd7c978
由 Douwe Maan 提交于 12月 03, 2015

1dd7c978
D

Fix specs · 5ab1b11e
由 Douwe Maan 提交于 12月 03, 2015

5ab1b11e

Merge branch 'ui/issuable-list-item' into 'master' · 76f00542

由 Dmitriy Zaporozhets 提交于 12月 03, 2015

UI: Issuable list item tweaks

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

Before:

![Screen_Shot_2015-12-02_at_17.37.40](/uploads/00ac22d131c49ce548bccd96866cbc75/Screen_Shot_2015-12-02_at_17.37.40.png)

After:

![merge_item_after](/uploads/201d742494596c50bbdb3626f06f65a8/merge_item_after.png)

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2590 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2589

See merge request !1962

76f00542

D

Fix spec · 0cbb7717
由 Douwe Maan 提交于 12月 03, 2015

0cbb7717

Merge branch 'ui/milestones' into 'master' · d63d12a5

由 Dmitriy Zaporozhets 提交于 12月 03, 2015

UI: Use new style for milestone detail page

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

Before:

![Screen_Shot_2015-12-02_at_17.47.03](/uploads/62441f50963e0c5d6d04b065573c05f0/Screen_Shot_2015-12-02_at_17.47.03.png)

After:

![Screen_Shot_2015-12-02_at_17.47.22](/uploads/ab29ac0c1819415cc647be173f8c92bd/Screen_Shot_2015-12-02_at_17.47.22.png)


See merge request !1966

d63d12a5

Merge branch 'ui/project-home-panel' into 'master' · 68e27b55

由 Dmitriy Zaporozhets 提交于 12月 03, 2015

UI: Project home panel tweaks

Depends on !1953

See the commits for more details, the messages mostly speak for themselves.

Before:

![Screen_Shot_2015-12-02_at_17.46.01](/uploads/f07a4f2370c6863a68df46f655b513c4/Screen_Shot_2015-12-02_at_17.46.01.png)

After:

![Screen_Shot_2015-12-02_at_17.45.40](/uploads/da9b19d3bd89b9421457e0df550efd6e/Screen_Shot_2015-12-02_at_17.45.40.png)


See merge request !1965

68e27b55

03 12月, 2015 5 次提交
- V
  Merge branch 'procfile' into 'master' · 76b2250c
  由 Valery Sizov 提交于 12月 03, 2015
```
The Procfile is for development only



See merge request !1950
```
  76b2250c
- J
  
  Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into procfile · aba55064
  由 Jacob Vosmaer 提交于 12月 03, 2015
  
  aba55064
- D
  Merge branch 'ui/emoji' into 'master' · b5103a83
  由 Dmitriy Zaporozhets 提交于 12月 03, 2015
```
UI: Award emoji tweaks

Before:

![emoji_before](/uploads/82786924d3cea0313321b9dde0356cd2/emoji_before.png)

After:

![emoji_after](/uploads/07e94401701d7a622c3ed5cbaa148244/emoji_after.png)

See merge request !1960
```
  b5103a83
- D
  
  Fix specs · 90899b32
  由 Douwe Maan 提交于 12月 03, 2015
  
  90899b32
- V
  
  Fix mailer queue · 9ce8c867
  由 Valery Sizov 提交于 12月 03, 2015
  
  9ce8c867