Commits · f0706f807f8cc5e08cabab2de0a011b351d66dbb · nexedi / gitlab-ce

17 Oct, 2017 15 commits
- Merge branch 'master' into sh-security-10-0-stable-ee · f0706f80
  Stan Hu authored Oct 17, 2017
  
  f0706f80
- Merge branch 'security-10-1-ee' into '10-1-stable-ee' · ccd35492
  Jen-Shin Lin authored Oct 17, 2017
```
Security fixes for 10.1 RC

See merge request gitlab/gitlab-ee!552
```
  ccd35492
- Merge branch 'ce_upstream' into 'master' · 0bf399f5
  Lin Jen-Shin (godfat) authored Oct 17, 2017
```
CE upstream

Closes #2709, gitaly#654, and gitlab-ce#36417

See merge request gitlab-org/gitlab-ee!3159
```
  0bf399f5
- Merge branch 'ce-to-ee-2017-10-13' into 'master' · 732750de
  Valery Sizov authored Oct 17, 2017
```
CE upstream: Friday

Closes gitaly#586, gitlab-ce#38871, and gitaly#629

See merge request gitlab-org/gitlab-ee!3144
```
  732750de
- Merge branch 'ce-to-ee-2017-10-13' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream · 35de9283
  Valery Sizov authored Oct 17, 2017
  
  35de9283
- Disable Metrics/AbcSize for UsageData#system_usage_data · 34d89620
  Valery Sizov authored Oct 17, 2017
  
  34d89620
- Merge branch '3532-configurable-geo-max-capacity' into 'master' · 046dca89
  Robert Speicher authored Oct 17, 2017
```
Make the maximum capacity of Geo backfill operations configurable

Closes #3532

See merge request gitlab-org/gitlab-ee!3107
```
  046dca89
- Merge remote-tracking branch 'ee/master' into ce-to-ee-2017-10-13 · 3a2aa432
  Lin Jen-Shin authored Oct 17, 2017
```
* ee/master:
  Port of fl-autodevops-fix to EE
  Port Git alternate dirs fix to EE
  Fix default crontab for Geo::FileDownloadDispatchWorker
  Allow the default branch as branch name
  Geo: Don't sync disabled project wikis
```
  3a2aa432
- Merge branch '3569-geo-backfill-unconditional-wiki' into 'master' · 03208c31
  Douwe Maan authored Oct 17, 2017
```
Geo: Don't sync disabled project wikis

Closes #3569

See merge request gitlab-org/gitlab-ee!3109
```
  03208c31
- [CE->EE] Resolve *.js · 4efbf574
  Valery Sizov authored Oct 17, 2017
  
  4efbf574
- [CE->EE] Resolve doc/api/settings.md · cdca89df
  Valery Sizov authored Oct 17, 2017
  
  cdca89df
- [CE->EE] Resolve usage data files · 984c4bee
  Valery Sizov authored Oct 17, 2017
  
  984c4bee
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream[ci skip] · 75269ab1
  Valery Sizov authored Oct 17, 2017
  
  75269ab1
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream · 5454016a
  Valery Sizov authored Oct 17, 2017
  
  5454016a
- Merge branch 'sprite-icon-class' into 'master' · 3fa410c8
  Phil Hughes authored Oct 17, 2017
```
Add ability to pass class name to spriteIcon helper

Closes #39079

See merge request gitlab-org/gitlab-ce!14855
```
  3fa410c8
16 Oct, 2017 25 commits
- Merge branch 'patch-29' into 'master' · 30083458
  Rémy Coutable authored Oct 16, 2017
```
Fix link to "Job Permissions"

See merge request gitlab-org/gitlab-ce!14896
```
  30083458
- Merge branch '37978-extra-border-radius-while-editing-a-file' into 'master' · 64d3ca51
  Annabel Dunstone Gray authored Oct 16, 2017
```
Remove extra border radius when editing a file

Closes #37978

See merge request gitlab-org/gitlab-ce!14803
```
  64d3ca51
- Remove extra border radius when editing a file · bfda3acd
  Rachel Pipkin authored Oct 16, 2017
  
  bfda3acd
- Merge branch 'update-new-project-docs' into 'master' · 7685314f
  Achilleas Pipinellis authored Oct 16, 2017
```
Update new project docs

See merge request gitlab-org/gitlab-ce!14893
```
  7685314f
- Update CHANGELOG.md for 10.0.4 · 2461b200
  Jarka Kadlecova authored Oct 16, 2017
```
[ci skip]
```
  2461b200
- Update CHANGELOG-EE.md for 10.0.4-ee · e2610dfd
  Jarka Kadlecova authored Oct 16, 2017
```
[ci skip]
```
  e2610dfd
- Merge branch 'ee-fl-autodevops-fix' into 'master' · 5b46f0fd
  Phil Hughes authored Oct 16, 2017
```
Port of fl-autodevops-fix to EE

See merge request gitlab-org/gitlab-ee!3145
```
  5b46f0fd
- Port of fl-autodevops-fix to EE · 1418ce02
  Filipa Lacerda authored Oct 16, 2017
  
  1418ce02
- Update CHANGELOG.md for 9.5.9 · 5d42b1e4
  Jarka Kadlecova authored Oct 16, 2017
```
[ci skip]
```
  5d42b1e4
- Update CHANGELOG-EE.md for 9.5.9-ee · 82b0f33b
  Jarka Kadlecova authored Oct 16, 2017
```
[ci skip]
```
  82b0f33b
- Update CHANGELOG.md for 9.4.7 · 94634833
  Jarka Kadlecova authored Oct 16, 2017
```
[ci skip]
```
  94634833
- Update CHANGELOG-EE.md for 9.4.7-ee · 945642da
  Jarka Kadlecova authored Oct 16, 2017
```
[ci skip]
```
  945642da
- Fix link to "Job Permissions" · ba13d1f4
  Willi Rath authored Oct 16, 2017
  
  ba13d1f4
- Merge branch '39035-move-gitlab-export-to-top-import-list' into 'master' · c021e8db
  Annabel Dunstone Gray authored Oct 16, 2017
```
39035 Move GitLab export option to top of import list when creating a new project

Closes #39035

See merge request gitlab-org/gitlab-ce!14830
```
  c021e8db
- Merge branch 'fl-autodevops-fix' into 'master' · 7996be60
  Phil Hughes authored Oct 16, 2017
```
Remove banner from pipelines page

Closes #38641, #39051, and #38827

See merge request gitlab-org/gitlab-ce!14849
```
  7996be60
- Remove banner from pipelines page · 490d117a
  Filipa Lacerda authored Oct 16, 2017
  
  490d117a
- Update new project docs · e11ef753
  Annabel Dunstone Gray authored Oct 16, 2017
  
  e11ef753
- Merge branch 'fix_global_board_routes_39073' into 'master' · d5bfb931
  Douwe Maan authored Oct 16, 2017
```
Remove "boards" from TOP_LEVEL_ROUTES

Closes #39073

See merge request gitlab-org/gitlab-ce!14861
```
  d5bfb931
- Merge branch 'sha-handling' into 'master' · 38ff8cd1
  Douwe Maan authored Oct 16, 2017
```
Adds requirements that supports anything in sha params

Closes #26561 and #2709

See merge request gitlab-org/gitlab-ce!14462
```
  38ff8cd1
- Merge branch 'bvl-allow-default-branch-as-branch-name' into 'master' · dca04bd9
  Douwe Maan authored Oct 16, 2017
```
Allow the default branch as branch name

Closes #3670

See merge request gitlab-org/gitlab-ee!3154
```
  dca04bd9
- Merge branch '39017-gitlabusagepingworker-is-not-running-on-gitlab-com' into 'master' · 07e33089
  Douwe Maan authored Oct 16, 2017
```
Resolve "GitlabUsagePingWorker is not running on GitLab.com"

See merge request gitlab-org/gitlab-ce!14867
```
  07e33089
- Merge branch 'zj-add-performance-changelog-cat' into 'master' · 3d48d977
  Robert Speicher authored Oct 16, 2017
```
Add Performance category to the changelog

Closes #36417

See merge request gitlab-org/gitlab-ce!14865
```
  3d48d977
- Merge branch 'port-git-alt-object-dirs-from-ce' into 'master' · 0e6f0bec
  Sean McGivern authored Oct 16, 2017
```
Port Git alternate dirs fix to EE

See merge request gitlab-org/gitlab-ee!3157
```
  0e6f0bec
- Merge branch 'ide-update-monaco' into 'master' · b69861c2
  Jacob Schatz authored Oct 16, 2017
```
Upgrading Monaco

Closes #38607

See merge request gitlab-org/gitlab-ce!14629
```
  b69861c2
- Merge branch '3771-fix-default-crontab-for-file-download-dispatch-worker' into 'master' · b55262eb
  Rémy Coutable authored Oct 16, 2017
```
Fix default crontab for Geo::FileDownloadDispatchWorker

Closes #3771

See merge request gitlab-org/gitlab-ee!3155
```
  b55262eb