Commits · defc6cd193351e4b5f9a1d595ef34e53667b9340 · nexedi / gitlab-ce

23 Feb, 2016 4 commits
- Merge branch 'ce_upstream' into 'master' · defc6cd1
  Valery Sizov authored Feb 23, 2016
```
CE upstream



See merge request !208
```
  defc6cd1
- fix merge · d3e78972
  Valery Sizov authored Feb 23, 2016
  
  d3e78972
- Merge remote-tracking branch 'origin/master' into ce_upstream · 270bc4bd
  Valery Sizov authored Feb 23, 2016
  
  270bc4bd
- Fix Gemfile · ed4b49b8
  Valery Sizov authored Feb 23, 2016
  
  ed4b49b8
22 Feb, 2016 36 commits
- Merge branch 'project-type-icon-your-projects' into 'master' · 7c809985
  Jacob Schatz authored Feb 22, 2016
```
Show project visibility level on project list

Fixes #3779

![Screen_Shot_2016-02-22_at_10.08.58](/uploads/611cc8aa2d12591d4fe6a70ba0f45d68/Screen_Shot_2016-02-22_at_10.08.58.png)

See merge request !2908
```
  7c809985
- Merge branch 'blame-line-link' into 'master' · 54a5b883
  Jacob Schatz authored Feb 22, 2016
```
Added line links to blame table

Closes #4119

See merge request !2915
```
  54a5b883
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · d10b43da
  Robert Speicher authored Feb 22, 2016
  
  d10b43da
- Add missing word to GitLab Flow doc · 9871612d
  Robert Speicher authored Feb 22, 2016
```
[ci skip]
```
  9871612d
- Merge branch 'fix-autocomplete-spec' into 'master' · 8de3358b
  Robert Speicher authored Feb 22, 2016
```
Fix volatile spec.

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/312.

See merge request !206
```
  8de3358b
- Merge branch 'fix/13631-error-with-merged-mr' into 'master' · 493d166d
  Rémy Coutable authored Feb 22, 2016
```
Ensure we don't check a commit's description for revert message if it has no description

Fixes #13631.

/cc @razer6 @grzesiek @yorickpeterse @rdavila 

See merge request !2917
```
  493d166d
- Merge branch 'saml-link-default' into 'master' · 7479f060
  Robert Speicher authored Feb 22, 2016
```
Properly set `auto_link_saml_user` default value in the Settings loader.

See merge request !2922
```
  7479f060
- Merge branch 'fix-moving-revert-button' into 'master' · 81e5c9c2
  Jacob Schatz authored Feb 22, 2016
```
Fixed revert button tooltip placement causing movement

Before:

![moving-tooltip](/uploads/65cb9a41e8b8114fd8ee10d68cfd8206/moving-tooltip.gif)

After:

![moving-tooltip](/uploads/a1c36eb5735dc7592c49f6b5cb1469b5/moving-tooltip.gif)

See merge request !2910
```
  81e5c9c2
- Make sure we recommend 2GB · b31c68aa
  Sytse Sijbrandij authored Feb 22, 2016
  
  b31c68aa
- Ensure we don't check a commit's description for revert message if it has no description · 96ed5c51
  Rémy Coutable authored Feb 22, 2016
  
  96ed5c51
- Merge branch 'status-indicator-size' into 'master' · 96ce80d5
  Jacob Schatz authored Feb 22, 2016
```
Changed the size of status indicators

![Screen_Shot_2016-02-22_at_12.53.25](/uploads/229593bf76a78a2ce658c565d805716a/Screen_Shot_2016-02-22_at_12.53.25.png)

![Screen_Shot_2016-02-22_at_12.53.36](/uploads/d328809a3288943a47bed2cf13611a03/Screen_Shot_2016-02-22_at_12.53.36.png)

Closes #12763

See merge request !2913
```
  96ce80d5
- Merge branch 'header-overflow-small-devices' into 'master' · 6fb523d2
  Jacob Schatz authored Feb 22, 2016
```
Fixed issue with header overflow

Fixes #13492

Before:

![Screen_Shot_2016-02-22_at_15.32.42](/uploads/aefec4e67368d0387f22448be8eea65c/Screen_Shot_2016-02-22_at_15.32.42.png)

After:

![Screen_Shot_2016-02-22_at_15.32.09](/uploads/76b0d96cd5d9a4076c9d0883aaaba003/Screen_Shot_2016-02-22_at_15.32.09.png)

See merge request !2921
```
  6fb523d2
- Properly set `auto_link_saml_user` default value in the Settings loader. · 99edb2a0
  Patricio Cano authored Feb 22, 2016
  
  99edb2a0
- Merge branch 'improve-merge-when-succeeded' into 'master' · df1cdefe
  Douwe Maan authored Feb 22, 2016
```
Check the HEAD of branch when doing Merge When Succeeded

Implements https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2894#note_3845158

cc @DouweM @grzesiek 


See merge request !2907
```
  df1cdefe
- Merge branch 'rs-mask-icon' into 'master' · 8c4cfb1f
  Robert Speicher authored Feb 22, 2016
```
Add a Pinned Tab icon for Safari

See http://apple.co/1SCRzrw

Closes #13540

[ci skip]

See merge request !2883
```
  8c4cfb1f
- Merge branch 'issue-sidebar-content-scrolling' into 'master' · 1ab5eb93
  Jacob Schatz authored Feb 22, 2016
```
Fixed issue with content in the issue sidebar disappearing

Closes #13626

See merge request !2919
```
  1ab5eb93
- Fix volatile spec. · cc796a1b
  Douwe Maan authored Feb 22, 2016
  
  cc796a1b
- Fixed issue with header overflow · 7f1c26cf
  Phil Hughes authored Feb 22, 2016
```
Fixes #13492
```
  7f1c26cf
- Fixed issue with content in the issue sidebar disappearing · d14889c2
  Phil Hughes authored Feb 22, 2016
```
Closes #13626
```
  d14889c2
- Merge branch 'issue_13463' into 'master' · 5803a530
  Jacob Schatz authored Feb 22, 2016
```
Fix Side-by-side view after loading diff results

Fixes #13463

See merge request !2880
```
  5803a530
- Changed the size of status indicators · 416b49d3
  Phil Hughes authored Feb 22, 2016
```
Closes #12763
```
  416b49d3
- Added line links to blame table · fbc578a7
  Phil Hughes authored Feb 22, 2016
```
Closes #4119
```
  fbc578a7
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream · baf86b26
  Valery Sizov authored Feb 22, 2016
  
  baf86b26
- Fixed revert button tooltip placement causing movement · aa1ac636
  Phil Hughes authored Feb 22, 2016
  
  aa1ac636
- Merge branch 'add_missing_doc' into 'master' · f51d8af5
  Achilleas Pipinellis authored Feb 22, 2016
```
Add when the API changes got introduced



See merge request !2912
```
  f51d8af5
- Add when the API changes got introduced · 13fd08b1
  Achilleas Pipinellis authored Feb 22, 2016
```
[ci skip]
```
  13fd08b1
- Merge branch 'fix-failing-issue-tests' into 'master' · 4c3c67a7
  Rémy Coutable authored Feb 22, 2016
```
Fixed failing issues tests

Also removed up/down vote icons from merge requests. Was missed from d8069bd8

See merge request !2911
```
  4c3c67a7
- removed merge-request-no-votes css class · 7bdddb48
  Phil Hughes authored Feb 22, 2016
  
  7bdddb48
- Update CHANGELOG and VERSION for 8.6.0-pre · a612ac1c
  Rémy Coutable authored Feb 22, 2016
  
  a612ac1c
- Fixed failing issues tests · 51c17329
  Phil Hughes authored Feb 22, 2016
```
Removed up/down vote icons from merge requests. Was missed from d8069bd8
```
  51c17329
- Merge branch 'pages_docs' into 'master' · 568fe1e2
  Achilleas Pipinellis authored Feb 22, 2016
```
Pages docs



See merge request !202
```
  568fe1e2
- Add missing gitlab-pages related vars in init.d/gitlab · 350003ed
  Achilleas Pipinellis authored Feb 22, 2016
  
  350003ed
- Merge branch 'fix-zero-votes-showing-on-issue-list' into 'master' · 1d9863c1
  Rémy Coutable authored Feb 22, 2016
```
Only show up or down votes icon on issue list if there are any

Closes #13649 

![Screen_Shot_2016-02-22_at_10.20.27](/uploads/21477426856dab9731bb110032025867/Screen_Shot_2016-02-22_at_10.20.27.png)

See merge request !2909
```
  1d9863c1
- Only show up or down votes icon on issue list if there are any · d8069bd8
  Phil Hughes authored Feb 22, 2016
```
Closes #13649
```
  d8069bd8
- Add missing Omnibus settings · f988808f
  Achilleas Pipinellis authored Feb 22, 2016
  
  f988808f
- Show project visibility level on project list · 49a95d98
  Phil Hughes authored Feb 22, 2016
```
Fixes #3779
```
  49a95d98