Commits · ebfad5b930d8384b092e857b078b2fe131859267 · nexedi / gitlab-ce

07 Jan, 2018 1 commit

Merge branch 'ce-to-ee-2018-01-06' into 'master' · ebfad5b9

Marin Jankovski authored Jan 07, 2018

CE upstream - Saturday

Closes gitlab-development-kit#310 and gitaly#872

See merge request gitlab-org/gitlab-ee!3946

ebfad5b9

06 Jan, 2018 7 commits
- Resolve 20160621123729_add_rebase_commit_sha_to_merge_requests.rb · 26642bfd
  LUKE BENNETT authored Jan 06, 2018
  
  26642bfd
- Merge branch 'ee-41249-clearing-the-cache' into 'master' · 12effe58
  Kamil Trzciński authored Jan 06, 2018
```
Ee 41249 clearing the cache

See merge request gitlab-org/gitlab-ee!3925
```
  12effe58
- Resolve lib/gitlab/git/repository.rb · 86952d0a
  Lin Jen-Shin authored Jan 06, 2018
  
  86952d0a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-06 · e33423e3
  GitLab Bot authored Jan 06, 2018
```
# Conflicts:
#	db/migrate/20160621123729_add_rebase_commit_sha_to_merge_requests.rb
#	lib/gitlab/git/repository.rb

[ci skip]
```
  e33423e3
- Use anchor instead of form for reset caches button · 1e3a8658
  Matija Čupić authored Jan 06, 2018
  
  1e3a8658
- Update installation.md for 10.4.0.rc1 · 6d972724
  LUKE BENNETT authored Jan 06, 2018
  
  6d972724
- Merge branch 'fix-ce-migration-timestamp' into 'master' · bfc1cf06
  Robert Speicher authored Jan 06, 2018
```
Fix rebase commit SHA migration name

See merge request gitlab-org/gitlab-ce!16256
```
  bfc1cf06
05 Jan, 2018 32 commits
- Merge branch 'ce-to-ee-2018-01-05' into 'master' · deeb5638
  Robert Speicher authored Jan 05, 2018
```
CE upstream - Friday

Closes gitaly#833 and gitlab-ce#41563

See merge request gitlab-org/gitlab-ee!3938
```
  deeb5638
- Merge branch... · ec5f7d10
  Kamil Trzciński authored Jan 05, 2018
```
Merge branch '41056-create-cluster-from-kubernetes-integration-application-template-ee' into 'master'

Create Separate EE::DeploymentPlatform module

See merge request gitlab-org/gitlab-ee!3943
```
  ec5f7d10
- Remove duplicate `rebase_commit_sha` field definition from schema · 9a394cc6
  Robert Speicher authored Jan 05, 2018
  
  9a394cc6
- Merge branch 'remove_labeled_issues_seed' into 'master' · a14aa6a6
  Sean McGivern authored Jan 05, 2018
```
Remove labeled issues seed

See merge request gitlab-org/gitlab-ce!16258
```
  a14aa6a6
- Create separate EE::DeploymentPlatform module · af04ad57
  Mayra Cabrera authored Jan 05, 2018
  
  af04ad57
- Fixes cluster feature broken specs · b8826ce7
  Mayra Cabrera authored Jan 05, 2018
  
  b8826ce7
- Merge branch 'sh-reuse-disk-repositories-seeder' into 'master' · aa4a335f
  Stan Hu authored Jan 05, 2018
```
Skip project repository disk validation in development project seeder

Closes gitlab-development-kit#310

See merge request gitlab-org/gitlab-ce!16257
```
  aa4a335f
- Merge branch '4481-move-gitlab-geo-check-after-database-replication' into 'master' · 87f770d4
  Stan Hu authored Jan 05, 2018
```
Move gitlab:geo:check after database replication

Closes #4481

See merge request gitlab-org/gitlab-ee!3941
```
  87f770d4
- Fix typo in CHANGELOG entry for Geo doc fix · d059a3c8
  Stan Hu authored Jan 05, 2018
  
  d059a3c8
- Fix typos in gitlab:geo:check sentence · 377cc83f
  Stan Hu authored Jan 05, 2018
  
  377cc83f
- Merge branch 'jramsay-fix-alignment-geo-docs' into 'master' · 32435ae8
  Stan Hu authored Jan 05, 2018
```
Fix broken alignment of database password in geo docs

Closes #4483

See merge request gitlab-org/gitlab-ee!3939
```
  32435ae8
- Make it clearer database password only needed for 10.4 and up · c54aa5a6
  Stan Hu authored Jan 05, 2018
  
  c54aa5a6
- Merge branch 'remove_labeled_issues_seed' into 'master' · bce886b7
  Sean McGivern authored Jan 05, 2018
```
Remove labeled issues seed

See merge request gitlab-org/gitlab-ce!16258
```
  bce886b7
- Add the EE `rebase_commit_sha` migration back in its original location · 15729025
  Robert Speicher authored Jan 05, 2018
  
  15729025
- Add clarification pg password from 10.4 onward · 7eb9246a
  James Ramsay authored Jan 05, 2018
  
  7eb9246a
- Move geo status check after db replication · 96934965
  James Ramsay authored Jan 05, 2018
```
Until db replication is completed the secondary will not have the
configuration needed to pass many of the status checks
```
  96934965
- Merge branch 'jramsay4480-remove-ntp-check-from-geo-docs' into 'master' · 51fe7978
  Stan Hu authored Jan 05, 2018
```
Remove NTP check from geo docs

Closes #4480

See merge request gitlab-org/gitlab-ee!3940
```
  51fe7978
- Remove duplicate manual NTP check · 33b6f6fd
  James Ramsay authored Jan 05, 2018
```
The NTP check is now included in `gitlab-rake gitlab:geo:check`
```
  33b6f6fd
- Fix broken alignment of geo db docs · 64edaeb0
  James Ramsay authored Jan 05, 2018
  
  64edaeb0
- Merge branch 'ee-41048-helpful-and-instructing-empty-state-for-multi-file-editor' into 'master' · 1eed12ac
  Filipa Lacerda authored Jan 05, 2018
```
EE Port for making IDE prettier

See merge request gitlab-org/gitlab-ee!3934
```
  1eed12ac
- EE Port for making IDE prettier · d92830a0
  Tim Zallmann authored Jan 05, 2018
  
  d92830a0
- Remove labeled issues seed · ff8971a7
  Felipe Artur authored Jan 05, 2018
  
  ff8971a7
- Fix rebase commit SHA migration name · 744e1db3
  Sean McGivern authored Jan 05, 2018
```
This already existed in EE with a different timestamp, so rename for CE and make
it idempotent.
```
  744e1db3
- Merge branch 'gitaly-multi-action-prep' into 'master' · a2aad053
  Rémy Coutable authored Jan 05, 2018
```
Move git operations for multi_action into Gitlab::Git

Closes gitaly#872

See merge request gitlab-org/gitlab-ce!16215
```
  a2aad053
- Merge branch 'master' into ee-41249-clearing-the-cache · d018a68c
  Matija Čupić authored Jan 05, 2018
  
  d018a68c
- Merge branch 'mk-fix-fast-ssh-key-lookup-links' into 'master' · 3e37a981
  Stan Hu authored Jan 05, 2018
```
Fix links to deprecated doc page (speed_up_ssh => fast_ssh_key_lookup)

See merge request gitlab-org/gitlab-ee!3937
```
  3e37a981
- Resolve conflict in lib/api/entities.rb · f5bc387d
  Rémy Coutable authored Jan 05, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f5bc387d
- Resolve conflict in doc/api/settings.md · ebb04aab
  Rémy Coutable authored Jan 05, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ebb04aab
- Resolve conflict in doc/api/boards.md · a973f060
  Rémy Coutable authored Jan 05, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  a973f060
- Resolve conflict in app/models/concerns/deployment_platform.rb · a148aa35
  Rémy Coutable authored Jan 05, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  a148aa35
- Resolve conflict in BranchesHelper by adding EE::BranchesHelper · 8c7bee0e
  Rémy Coutable authored Jan 05, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  8c7bee0e
- Fix conflicts in merge_request_widget.json spec · 83556acf
  Jan Provaznik authored Jan 05, 2018
  
  83556acf