Коммиты · 496870ddec632ae13cff8b5e8f6ca0bff0fa3ec7 · nt_test134 / nt_project_0mr5aoytso1m

04.12.2015 4 коммита

Migrate from Sidetiq to Sidekiq-cron

· 496870dd

Gabriel Mazetto создал Дек 03, 2015
```
Updated Sidekiq to 3.5.x
```
496870dd
Merge branch 'ci_docker_docs' into 'master'

· 95fd7983

Kamil Trzciński создал Дек 03, 2015
```
fixes #3263 slashes are replaced with two underscores



See merge request !1981
```
95fd7983
fixes #3263 slashes are replaced with two underscores

· 387e5656

Kevin Pankonen создал Дек 03, 2015

387e5656

Merge branch 'issue_3468_broken_link' into 'master'

· 1481255e

Drew Blessing создал Дек 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

03.12.2015 32 коммита

Merge branch 'ui/wiki' into 'master'

· abb72618

Dmitriy Zaporozhets создал Дек 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 создал Дек 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 создал Дек 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 создал Дек 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

Fixed invalid link on starred projects dashboard.

· c5b6b31c

Anton Baklanov создал Ноя 18, 2015
```
Fixes #3468
```
c5b6b31c
Touch project when toggling stars to update cache

· 82e916b0

Gabriel Mazetto создал Дек 01, 2015

82e916b0
Fix spec

· 494ebad3

Douwe Maan создал Дек 03, 2015

494ebad3
Fix specs

· 5ab1b11e

Douwe Maan создал Дек 03, 2015

5ab1b11e

Merge branch 'ui/issuable-list-item' into 'master'

· 76f00542

Dmitriy Zaporozhets создал Дек 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

Merge branch 'ui/milestones' into 'master'

· d63d12a5

Dmitriy Zaporozhets создал Дек 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 создал Дек 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

Merge branch 'procfile' into 'master'

· 76b2250c

Valery Sizov создал Дек 03, 2015
```
The Procfile is for development only



See merge request !1950
```
76b2250c
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into procfile

· aba55064

Jacob Vosmaer создал Дек 03, 2015

aba55064

Merge branch 'ui/emoji' into 'master'

· b5103a83

Dmitriy Zaporozhets создал Дек 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

Merge branch 'master' into ui/wiki

· 97ddf2df

Douwe Maan создал Дек 03, 2015

97ddf2df
Merge branch 'master' into ui/project-home-panel

· e84edc20

Douwe Maan создал Дек 03, 2015

e84edc20
Merge branch 'master' into ui/new-project

· fc5afc60

Douwe Maan создал Дек 03, 2015

fc5afc60
Merge branch 'master' into ui/milestones

· f3de9d78

Douwe Maan создал Дек 03, 2015

f3de9d78
Merge branch 'master' into ui/issuable-list-item

· 00ebe223

Douwe Maan создал Дек 03, 2015

00ebe223
Merge branch 'master' into ui/issuable-filter

· ac897266

Douwe Maan создал Дек 03, 2015

ac897266
Merge branch 'master' into ui/emoji

· 535d9306

Douwe Maan создал Дек 03, 2015

535d9306
Merge branch 'fix_master' into 'master'

· 6689224a

Valery Sizov создал Дек 03, 2015
```
Fix failures in master



See merge request !1974
```
6689224a
Fix failures in master

· b871c38b

Valery Sizov создал Дек 03, 2015

b871c38b

Merge branch 'deprecated_warnings' into 'master'

· b4b67b02

Dmitriy Zaporozhets создал Дек 03, 2015

Git rid of deprecated warnings after rails update

https://gitlab.com/gitlab-org/gitlab-ce/issues/3798

https://gitlab.com/gitlab-org/gitlab-ce/issues/3797

See merge request !1946

b4b67b02

Merge branch 'test_fix' into 'master'

· 843df4ed

Valery Sizov создал Дек 03, 2015
```
Fix broken spec related to MySQL and fractional seconds support.



See merge request !1973
```
843df4ed
Rails deprecation warning about log_level

· f21bbd44

Valery Sizov создал Дек 03, 2015

f21bbd44
fix Celluloid warnings

· 54b74aa9

Valery Sizov создал Дек 03, 2015

54b74aa9
fix deprecation messages in tests

· 162cd009

Valery Sizov создал Дек 03, 2015

162cd009
Fix broken spec related to MySQL and fractional seconds support.

· f94afdbd

Rubén Dávila создал Дек 02, 2015

f94afdbd

Merge branch 'ui/consistency' into 'master'

· ca7e31c4

Dmitriy Zaporozhets создал Дек 02, 2015

UI: Improve consistency across the board

Depends on !1953

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

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2577

See merge request !1954

ca7e31c4

Merge branch 'ui/no-minimal-height' into 'master'

· bb76a9e2

Dmitriy Zaporozhets создал Дек 02, 2015

UI: Remove minimum container height

Depends on !1953

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

Before:

![Screen_Shot_2015-12-02_at_15.42.07](/uploads/1d8e19e4738bec39074cbb9afc400ad5/Screen_Shot_2015-12-02_at_15.42.07.png)

After:

![Screen_Shot_2015-12-02_at_15.50.34](/uploads/56153fe19bb72163a2dc9dd83850ad89/Screen_Shot_2015-12-02_at_15.50.34.png)


See merge request !1957

bb76a9e2

Merge branch 'ui/gl-padding' into 'master'

· 858e8903

Dmitriy Zaporozhets создал Дек 02, 2015

UI: More consistent alignment and padding

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

# Highlights:

## Merge request form bottom

Before:

![mr_before](/uploads/de2ae608d300784b61818bc33538ac64/mr_before.png)

After: 

![mr_after](/uploads/9b1568d8287704ee9497cc029e827778/mr_after.png)

## Issue header

Before:

![issue_before](/uploads/e8cc4fb316219f025ff7bd74c7da8677/issue_before.png)

After:

![issue_after](/uploads/5fbad99f038571196c3c3c2bea304381/issue_after.png)

## Empty repository message

Before:

![empty_before](/uploads/f6ab80aea9af9111c3dc260d5fa98cd6/empty_before.png)

After:

![empty_after](/uploads/40a528f5a45f4e47776356c88aab24c4/empty_after.png)

Fixes #3742 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2594

See merge request !1953

858e8903

02.12.2015 4 коммита
- Merge branch 'workhorse_in_patch_update' into 'master'
  
  · 5453eb7d
  
  Hannes Rosenögger создал Дек 02, 2015
```
Also update gitlab-workhorse in patch updates [ci skip]

Fixes #3747 

See merge request !1959
```
  5453eb7d
- Merge pull request #9873 from atomaka/atomaka/feature/prevent-blocked-impersonation
  
  · cc525133
  
  Stan Hu создал Дек 02, 2015
```
Prevent impersonation if blocked
```
  cc525133
- Be more explicit with the impersonate return URL
  
  · ec754d22
  
  Andrew Tomaka создал Дек 02, 2015
  
  ec754d22
- Tweak merge request list item
  
  · f10bd7df
  
  Douwe Maan создал Дек 02, 2015
  
  f10bd7df