Commits · 6ae46053ca76a85240bf1584672ca39487aeb269 · nexedi / gitlab-ce

12 Oct, 2018 21 commits
- Merge branch 'ce-to-ee-2018-10-12' into 'master' · 6ae46053
  Filipa Lacerda authored Oct 12, 2018
```
CE upstream - 2018-10-12 13:21 UTC

See merge request gitlab-org/gitlab-ee!7909
```
  6ae46053
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-12 · 0329e677
  GitLab Bot authored Oct 12, 2018
  
  0329e677
- Merge branch 'fl-update-svgs' into 'master' · 0047869c
  Mike Greiling authored Oct 12, 2018
```
Updates gitlab-svg dependency

See merge request gitlab-org/gitlab-ce!22299
```
  0047869c
- Merge branch 'ce-to-ee-2018-10-12' into 'master' · 8ea0dcda
  Marin Jankovski authored Oct 12, 2018
```
CE upstream - 2018-10-12 12:21 UTC

See merge request gitlab-org/gitlab-ee!7907
```
  8ea0dcda
- Merge branch 'update-pages-to-1-2-again' into 'master' · 32055e21
  Stan Hu authored Oct 12, 2018
```
Update GitLab Pages to v1.2.1

See merge request gitlab-org/gitlab-ce!22318
```
  32055e21
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-12 · 2090b217
  GitLab Bot authored Oct 12, 2018
  
  2090b217
- Merge branch 'ce-to-ee-2018-10-12' into 'master' · d05e0ae3
  Filipa Lacerda authored Oct 12, 2018
```
CE upstream - 2018-10-12 11:21 UTC

See merge request gitlab-org/gitlab-ee!7906
```
  d05e0ae3
- Merge branch '52608-sidebar' into 'master' · e6a6e15e
  Tim Zallmann authored Oct 12, 2018
```
Hide job sidebar on mobile

Closes #52608

See merge request gitlab-org/gitlab-ce!22314
```
  e6a6e15e
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-12 · 5b39f56a
  GitLab Bot authored Oct 12, 2018
  
  5b39f56a
- Merge branch '52361-fix-file-tree-mobile' into 'master' · 8d9f4670
  Filipa Lacerda authored Oct 12, 2018
```
Resolve "Make file browser hidden by default for mobile screens" and improve layout in small screens too

Closes #52361

See merge request gitlab-org/gitlab-ce!22273
```
  8d9f4670
- Update GitLab Pages to v1.2.1 · c1bf1e26
  Nick Thomas authored Oct 12, 2018
  
  c1bf1e26
- Updates gitlab-svg dependency · 97701019
  Filipa Lacerda authored Oct 11, 2018
  
  97701019
- Hide job sidebar on mobile · a9d91ed2
  Filipa Lacerda authored Oct 12, 2018
```
This commit adds back `js-` classes needed to
automatically collapse the sidebar on resize.
```
  a9d91ed2
- Merge branch 'improve-ee_specific_check' into 'master' · e49030cf
  Sean McGivern authored Oct 12, 2018
```
Improve ee specific check

See merge request gitlab-org/gitlab-ee!7859
```
  e49030cf
- Merge branch 'patch-13' into 'master' · 459245d3
  Achilleas Pipinellis authored Oct 12, 2018
```
docs: fix typos in multi_project_pipelines.md

See merge request gitlab-org/gitlab-ee!7897
```
  459245d3
- Merge branch 'docs-remove-duplicate-section' into 'master' · 2d3c8743
  Achilleas Pipinellis authored Oct 12, 2018
```
Remove a duplicate 'Dependency Scanning' section

See merge request gitlab-org/gitlab-ee!7886
```
  2d3c8743
- Merge branch 'docs/remove-link-old-project-ee' into 'master' · b0d40504
  Achilleas Pipinellis authored Oct 12, 2018
```
(Port from CE) Removes link to deprecated project

See merge request gitlab-org/gitlab-ee!7877
```
  b0d40504
- Merge branch 'ce-to-ee-2018-10-12' into 'master' · e68bf31b
  Stan Hu authored Oct 12, 2018
```
CE upstream - 2018-10-12 04:27 UTC

See merge request gitlab-org/gitlab-ee!7902
```
  e68bf31b
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-12 · f518f8e3
  GitLab Bot authored Oct 12, 2018
  
  f518f8e3
- Merge branch 'ce-to-ee-2018-10-11' into 'master' · 840c3381
  Stan Hu authored Oct 12, 2018
```
CE upstream - 2018-10-11 22:21 UTC

See merge request gitlab-org/gitlab-ee!7900
```
  840c3381
- Merge branch 'fix_block_context' into 'master' · a5ecb5bb
  Evan Read authored Oct 12, 2018
```
Specification change: Fix asciidoctor block context.

See merge request gitlab-org/gitlab-ce!22280
```
  a5ecb5bb
11 Oct, 2018 19 commits
- Improve MR file tree on small screens · 52cf955b
  André Luís authored Oct 10, 2018
  
  52cf955b
- Merge branch '50185-fix-broken-file-name-navigation' into 'master' · 9f006df6
  Mike Greiling authored Oct 11, 2018
```
Fix broken file name navigation on MRs

Closes #50185

See merge request gitlab-org/gitlab-ce!22109
```
  9f006df6
- Fix broken file name navigation on MRs · a577cfcb
  Jacques Erasmus authored Oct 11, 2018
  
  a577cfcb
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-11 · 3dd71df7
  GitLab Bot authored Oct 11, 2018
  
  3dd71df7
- Merge branch '51712-prefer-jasmine-matcher' into 'master' · da4f7795
  Mike Greiling authored Oct 11, 2018
```
4. enable jasmine/prefer-jasmine-matcher

See merge request gitlab-org/gitlab-ce!22236
```
  da4f7795
- Merge branch '51712-prefer-jasmine-matcher-ee' into 'master' · 60d1e66d
  Mike Greiling authored Oct 11, 2018
```
4. enable jasmine/prefer-jasmine-matcher

See merge request gitlab-org/gitlab-ee!7888
```
  60d1e66d
- Fix typos in multi_project_pipelines.md · 757d6ae8
  Christian Couder authored Oct 11, 2018
  
  757d6ae8
- Merge branch 'ce-to-ee-2018-10-11' into 'master' · 237cfbe1
  🤖 GitLab Bot 🤖 authored Oct 11, 2018
```
CE upstream - 2018-10-11 20:38 UTC

See merge request gitlab-org/gitlab-ee!7896
```
  237cfbe1
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-11 · 91d7b6dc
  GitLab Bot authored Oct 11, 2018
  
  91d7b6dc
- Merge branch '1363-fetch-remote-default-branch-doesn-t-work-with-ssh-mirrors' into 'master' · fcf8f95e
  Stan Hu authored Oct 11, 2018
```
Don't synchronize default branch when updating a SSH mirror

See merge request gitlab-org/gitlab-ee!7891
```
  fcf8f95e
- Merge branch '51712-new-line-between-declarations' into 'master' · db85dbbf
  Mike Greiling authored Oct 11, 2018
```
1. enable jasmine/new-line-between-declarations

See merge request gitlab-org/gitlab-ce!22230
```
  db85dbbf
- Merge branch '51712-new-line-between-declarations-ee' into 'master' · 6d06f079
  Mike Greiling authored Oct 11, 2018
```
1. enable jasmine/new-line-between-declarations

See merge request gitlab-org/gitlab-ee!7871
```
  6d06f079
- Merge branch '52570-erased-block' into 'master' · 80a1bb1d
  Mike Greiling authored Oct 11, 2018
```
Fix erased block not being rendered when job was erased

Closes #52570

See merge request gitlab-org/gitlab-ce!22294
```
  80a1bb1d
- Fix erased block not being rendered when job was erased · dd0806d0
  Filipa Lacerda authored Oct 11, 2018
  
  dd0806d0
- Merge branch 'ce-to-ee-2018-10-11' into 'master' · 1e6286b0
  Robert Speicher authored Oct 11, 2018
```
CE upstream - 2018-10-11 17:03 UTC

Closes gitlab-qa#257 and gitlab-org/release/framework#17

See merge request gitlab-org/gitlab-ee!7890
```
  1e6286b0
- Don't synchronize default branch when updating a SSH mirror · 42ae81af
  Douglas Barbosa Alexandre authored Oct 11, 2018
```
Disable the default branch update if SSH project mirrors are
being used for now, since it is affecting GitLab.com users
```
  42ae81af
- Resolve .rubocop.yml · b3c904a8
  Robert Speicher authored Oct 11, 2018
  
  b3c904a8
- Resolve doc/ci/triggers/README.md · 906019fa
  Robert Speicher authored Oct 11, 2018
  
  906019fa
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-11 · b9aa76fe
  GitLab Bot authored Oct 11, 2018
```
# Conflicts:
#	.rubocop.yml
#	doc/ci/triggers/README.md

[ci skip]
```
  b9aa76fe