Commits · 8d85935c56b8f8a0e2ad859efe98e6dab93bd569 · nexedi / gitlab-ce

04 Dec, 2017 27 commits
- Merge branch 'sh-geo-check-url-column-check' into 'master' · 8d85935c
  Nick Thomas authored Dec 04, 2017
```
Check that the "url" column exists in the GeoNode table before attempting to use it

Closes #4214

See merge request gitlab-org/gitlab-ee!3608
```
  8d85935c
- Merge branch 'fix-rspec-pg-dedicated-runner' into 'master' · a930a04b
  Rémy Coutable authored Dec 04, 2017
```
Run the Geo specs on dedicated runners

See merge request gitlab-org/gitlab-ee!3619
```
  a930a04b
- Merge branch 'ee-psimyn-issue-note-refac' into 'master' · ffe6e3f6
  Fatih Acet authored Dec 04, 2017
```
issue note component rename

See merge request gitlab-org/gitlab-ee!3568
```
  ffe6e3f6
- Merge branch 'elastic-search-support-future' into 'master' · fd1ef1ad
  Nick Thomas authored Dec 04, 2017
```
Elastic search support for 6.0 in the future

See merge request gitlab-org/gitlab-ee!3622
```
  fd1ef1ad
- Run the Geo specs on dedicated runners · 734e48f2
  Nick Thomas authored Dec 04, 2017
  
  734e48f2
- Elastic search support for 6.0 in the future · 46522d32
  Victor Wu authored Dec 04, 2017
  
  46522d32
- Merge branch 'sh-optimize-groups-api-ee' into 'master' · 0fd66f26
  Douwe Maan authored Dec 04, 2017
```
Port from CE: Optimize API /groups/:id/projects by preloading assocations

See merge request gitlab-org/gitlab-ee!3604
```
  0fd66f26
- Port from CE: Optimize API /groups/:id/projects by preloading assocations · 281f4cf6
  Francisco Javier López authored Dec 04, 2017
  
  281f4cf6
- Merge branch 'ce-to-ee-2017-11-30' into 'master' · e160f89a
  Rémy Coutable authored Dec 04, 2017
```
CE upstream - Thursday

Closes gitlab-ce#40671

See merge request gitlab-org/gitlab-ee!3593
```
  e160f89a
- Merge branch 'ee-40711-fix-forking-hashed-projects' into 'master' · fc57c9eb
  Douwe Maan authored Dec 04, 2017
```
Fix the fork project functionality for projects with hashed storage (EE)

See merge request gitlab-org/gitlab-ee!3617
```
  fc57c9eb
- Merge branch '3844-add-option-to-projects-to-only-import-protected-branches' into 'master' · 0b2e0a4e
  Douwe Maan authored Dec 04, 2017
```
Adds option for new project to only import protected branches

Closes #3844

See merge request gitlab-org/gitlab-ee!3326
```
  0b2e0a4e
- Resolve conflict in spec/controllers/projects/branches_controller_spec.rb · 42df7dcd
  Rémy Coutable authored Dec 04, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  42df7dcd
- Resolve conflict in app/models/environment.rb · 5c2c9a3f
  Rémy Coutable authored Dec 04, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  5c2c9a3f
- Resolve conflict in app/models/clusters/platforms/kubernetes.rb · 3a1aa0a5
  Rémy Coutable authored Dec 04, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  3a1aa0a5
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-11-30 · a091e24d
  Rémy Coutable authored Dec 04, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  a091e24d
- Adds skip_branch method to remote mirror update service · c0a78957
  Tiago Botelho authored Dec 01, 2017
  
  c0a78957
- Merge branch '38668-revert-copied-kubernetesservice-logic-ee' into 'master' · 7afa3f47
  Grzegorz Bizon authored Dec 04, 2017
```
Port to EE: Copy `KubernetesService` logic in `Clusters::Platforms::Kubernetes` to make it interchangeable. And implement a selector.

See merge request gitlab-org/gitlab-ee!3551
```
  7afa3f47
- Fix a spec failure due to the rename of Project#deployment_service to #deployment_platform · 4b87f081
  Rémy Coutable authored Dec 04, 2017
```
See
https://gitlab.com/gitlab-org/gitlab-ce/commit/53da3d976f3705a87edc50dca41748b5e479fc83
and https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/43012757Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  4b87f081
- Create models directly in migration specs · cf6fbda0
  Bob Van Landuyt authored Nov 30, 2017
```
Instead of using the factories. Since the factories might be using
columns that aren't available in the schema at version the particular
spec is running in.
```
  cf6fbda0
- Adds option for projects to only mirror protected branches. · f5a7c34d
  Tiago Botelho authored Nov 09, 2017
  
  f5a7c34d
- Fix the fork project functionality for projects with hashed storage · ecfdb165
  Nick Thomas authored Nov 30, 2017
```
Note the dependency on gitlab-shell v5.10.0
```
  ecfdb165
- Merge branch 'sh-geo-separate-queues' into 'master' · b6ca1ab2
  Nick Thomas authored Dec 04, 2017
```
Move Geo download jobs into separate queues for easier tracking and scheduling

See merge request gitlab-org/gitlab-ee!3607
```
  b6ca1ab2
- Merge branch 'master-i18n' into 'master' · 5f306480
  Douwe Maan authored Dec 04, 2017
```
New Crowdin translations

See merge request gitlab-org/gitlab-ee!3378
```
  5f306480
- Merge branch 'doc-evn-ssh-or-sshd' into 'master' · 76105b88
  Nick Thomas authored Dec 04, 2017
```
Clarify it may be ssh

See merge request gitlab-org/gitlab-ee!3598
```
  76105b88
- Used seed-fu in db/fixtures/test/01_plan.rb so that if seed-fu is broken, we'll catch it · 0cbf3e5c
  Rémy Coutable authored Dec 04, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0cbf3e5c
- Remove unnecessary changes · d520a3ae
  Shinya Maeda authored Dec 04, 2017
  
  d520a3ae
- Merge branch 'master' into 38668-revert-copied-kubernetesservice-logic-ee · ed2513a1
  Shinya Maeda authored Dec 04, 2017
  
  ed2513a1
03 Dec, 2017 2 commits
- Don't disable the Rails mailer when seeding the test environment · a25df59e
  Robert Speicher authored Dec 01, 2017
  
  a25df59e
- Check that the "url" column exists in the GeoNode table before attempting to use it · ad5ad30c
  Stan Hu authored Dec 01, 2017
```
Closes #4214
```
  ad5ad30c
02 Dec, 2017 3 commits
- Move Geo download jobs into separate queues for easier tracking and scheduling · c042a9f1
  Stan Hu authored Dec 01, 2017
```
Also moves the geo_file_download_worker.rb -> geo/file_download_worker.rb
```
  c042a9f1
- Revert "Geo: Prepare for shard-specific repository sync worker" · ccddf64f
  Stan Hu authored Dec 01, 2017
```
This reverts commit 83b31c0e.
```
  ccddf64f
- Geo: Prepare for shard-specific repository sync worker · 83b31c0e
  Stan Hu authored Dec 01, 2017
  
  83b31c0e
01 Dec, 2017 8 commits
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ee-psimyn-issue-note-refac · 065886a1
  Simon Knox authored Dec 02, 2017
  
  065886a1
- Provide installation specific reload instructions · f75f42e5
  Ernst van Nierop authored Dec 01, 2017
  
  f75f42e5
- Merge branch 'jramsay-geo-hashed-storage-upgrade-docs' into 'master' · cc57f0c4
  Stan Hu authored Dec 01, 2017
```
Add hashed storage warning to upgrade guide

Closes #4186

See merge request gitlab-org/gitlab-ee!3524
```
  cc57f0c4
- Add hashed storage warning to upgrade guide · 0d812f1b
  James Ramsay authored Dec 01, 2017
  
  0d812f1b
- Merge branch 'docs-export-import-issues' into 'master' · 85dfd584
  Achilleas Pipinellis authored Dec 01, 2017
```
Docs export import issues

See merge request gitlab-org/gitlab-ee!3594
```
  85dfd584
- Fix kubernetes_spec.rb. (Resync KubernetesService and PlatForm::Kubernetes) · d39f1fdd
  Shinya Maeda authored Dec 01, 2017
  
  d39f1fdd
- Add EE spec for KubernetesService and Platform::Kubernetes compatibility · a0802dd8
  Shinya Maeda authored Dec 01, 2017
  
  a0802dd8
- Restore unexpectedly removed code (Unrelated to this feature) · 582e4014
  Shinya Maeda authored Nov 30, 2017
  
  582e4014