Commits · c9374dca0df1e4e371c8318ebee2a43136f90af5 · nexedi / gitlab-ce

03 Jul, 2018 14 commits
- Merge branch 'docs/license-management-copyedit' into 'master' · c9374dca
  Marcia Ramos authored Jul 03, 2018
```
Copyedit license management docs

Closes gitlab-ce#47859

See merge request gitlab-org/gitlab-ee!6357
```
  c9374dca
- Merge branch 'docs/ha-webcast' into 'master' · 45dc1177
  Marcia Ramos authored Jul 03, 2018
```
Add HA webcast video to HA docs

See merge request gitlab-org/gitlab-ee!6352
```
  45dc1177
- Add HA webcast video to HA docs · 42f6229e
  Achilleas Pipinellis authored Jul 03, 2018
  
  42f6229e
- Merge branch 'docs/bamboo-ee' into 'master' · e1d4c5c2
  Marcia Ramos authored Jul 03, 2018
```
Copyedit Bamboo integration docs

See merge request gitlab-org/gitlab-ee!6354
```
  e1d4c5c2
- Merge branch 'products-links-to-pricing' into 'master' · 5037fe11
  Achilleas Pipinellis authored Jul 03, 2018
```
Change two /products links to /pricing

See merge request gitlab-org/gitlab-ee!6356
```
  5037fe11
- Change two /products links to /pricing · 43d264b0
  Marcel Amirault authored Jul 03, 2018
  
  43d264b0
- Merge branch 'master-i18n' into 'master' · 35a7a759
  Douwe Maan authored Jul 03, 2018
```
New Crowdin translations

See merge request gitlab-org/gitlab-ee!6299
```
  35a7a759
- Copyedit license management docs · 57a22479
  Achilleas Pipinellis authored Jul 03, 2018
  
  57a22479
- Merge branch 'docs-old-links-cleanup-ee-only' into 'master' · 5a8b0a7b
  Achilleas Pipinellis authored Jul 03, 2018
```
Changing /products links to /pricing links to reduce redirects and improve consistency

See merge request gitlab-org/gitlab-ee!6350
```
  5a8b0a7b
- Changing /products links to /pricing links to reduce redirects and improve consistency · 3f6e0732
  Marcel Amirault authored Jul 03, 2018
  
  3f6e0732
- Copyedit Bamboo integration docs · 31767449
  Achilleas Pipinellis authored Jul 02, 2018
  
  31767449
- Merge branch '5868-osw-allow-all-char-but-slashes-jira-integration' into 'master' · d631467a
  Sean McGivern authored Jul 03, 2018
```
Resolve "JIRA Development Panel project sync fails for projects with dots in name"

Closes #5868

See merge request gitlab-org/gitlab-ee!6349
```
  d631467a
- Merge branch 'ce-to-ee-2018-07-02' into 'master' · 3c69d253
  Stan Hu authored Jul 03, 2018
```
CE upstream - 2018-07-02 09:22 UTC

Closes #5864

See merge request gitlab-org/gitlab-ee!6346
```
  3c69d253
- Resolve conflict in package.json · 609a9558
  Stan Hu authored Jul 02, 2018
  
  609a9558
02 Jul, 2018 26 commits
- Allow all but "/" chars for groups and projects paths on Jira dev panel integration · 0f813189
  Oswaldo Ferreira authored Jul 02, 2018
  
  0f813189
- Merge branch 'da-recalculates-the-checksum-for-projects-up-to-date' into 'master' · a11c8496
  Stan Hu authored Jul 02, 2018
```
Geo - Recalculates the checksum for projects up to date

Closes #6773 and #6423

See merge request gitlab-org/gitlab-ee!6333
```
  a11c8496
- Merge branch... · 60aa1a33
  Fatih Acet authored Jul 02, 2018
```
Merge branch 'ee-6224-extract-ee-specific-files-lines-for-app-views-shared-boards-components' into 'master'

Resolve "Extract EE specific files/lines for app/views/shared/boards/components"

Closes #6224

See merge request gitlab-org/gitlab-ee!6343
```
  60aa1a33
- Add CHANGELOG · cd9c1b5e
  Douglas Barbosa Alexandre authored Jun 29, 2018
  
  cd9c1b5e
- Rename repository verification service on secondary node · d4f3f0ef
  Douglas Barbosa Alexandre authored Jun 29, 2018
  
  d4f3f0ef
- New translations gitlab.pot (French) · 56653a61
  GitLab Crowdin Bot authored Jul 02, 2018
  
  56653a61
- Merge branch 'add-review-apps' into 'master' · d6821249
  Rémy Coutable authored Jul 02, 2018
```
Add review apps for EE

See merge request gitlab-org/gitlab-ee!6259
```
  d6821249
- Extract Geo::RepositoryVerificationPrimaryService · 8f105380
  Douglas Barbosa Alexandre authored Jun 29, 2018
  
  8f105380
- Recalculates the checksum for projects up to date · ef9c1792
  Douglas Barbosa Alexandre authored Jun 29, 2018
  
  ef9c1792
- Merge branch 'crose-amend-bamboo-steps' into 'master' · 1c817595
  Achilleas Pipinellis authored Jul 02, 2018
```
Doc update for Bamboo Integration with GitLab

See merge request gitlab-org/gitlab-ee!6311
```
  1c817595
- Doc update for Bamboo Integration with GitLab · 39048a2b
  Chris Rose authored Jul 02, 2018
  
  39048a2b
- Merge branch '6195-http-git-push-to-secondary-for-git-lfs-currently-does-not-work' into 'master' · e5f92197
  Nick Thomas authored Jul 02, 2018
```
Resolve "Git LFS: Support for HTTP git push to secondary"

Closes #6195

See merge request gitlab-org/gitlab-ee!6109
```
  e5f92197
- Merge branch 'patch-7' into 'master' · c5915736
  Achilleas Pipinellis authored Jul 02, 2018
```
Update index.md changed "gonna" to "going to be"

See merge request gitlab-org/gitlab-ee!6312
```
  c5915736
- Fixed lint error · f1da0994
  Constance Okoghenun authored Jul 02, 2018
  
  f1da0994
- Merge branch 'dm-user-without-projects-performance-ee' into 'master' · cd5f7163
  Yorick Peterse authored Jul 02, 2018
```
[EE] Improve performance of User.without_projects scope

See merge request gitlab-org/gitlab-ee!6330
```
  cd5f7163
- Merge branch 'document-11.1-ce-to-ee' into 'master' · f051114c
  James Lopez authored Jul 02, 2018
```
Add From Community Edition 11.1 to Enterprise Edition 11.1 guide

See merge request gitlab-org/gitlab-ee!6345
```
  f051114c
- Resolve conflict in spec/workers/project_cache_worker_spec.rb · 91cedd25
  Imre Farkas authored Jul 02, 2018
  
  91cedd25
- Resolve conflict in app/workers/project_cache_worker.rb · 9ec1644f
  Imre Farkas authored Jul 02, 2018
  
  9ec1644f
- Resolved conflict in boards sidebar between CE && EE · 4d3d1252
  Constance Okoghenun authored Jul 02, 2018
  
  4d3d1252
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-02 · be0eca32
  GitLab Bot authored Jul 02, 2018
```
# Conflicts:
#	app/workers/project_cache_worker.rb
#	package.json
#	spec/workers/project_cache_worker_spec.rb

[ci skip]
```
  be0eca32
- Resolved conflict in boards sidebar between CE && EE · 322ce8e2
  Constance Okoghenun authored Jul 02, 2018
  
  322ce8e2
- Improve performance of User.without_projects scope · 37dfe202
  Douwe Maan authored Jun 29, 2018
  
  37dfe202
- Add From Community Edition 11.1 to Enterprise Edition 11.1 guide · 1edc0ec1
  Alessio Caiazza authored Jul 02, 2018
  
  1edc0ec1
- Merge branch '43270-import-with-milestones-failing' into 'master' · 3c0ff4dd
  Douwe Maan authored Jul 02, 2018
```
Resolve "Import with Milestones Failing"

Closes #43270 and #47626

See merge request gitlab-org/gitlab-ce!19961
```
  3c0ff4dd
- Merge branch 'fix/gb/external-ci-files-use-default-branch' into 'master' · 7ed779bd
  Douwe Maan authored Jul 02, 2018
```
Use default branch SHA to get external files using `include`

Closes #5864

See merge request gitlab-org/gitlab-ee!6325
```
  7ed779bd
- Merge branch 'fix/gb/make-root-ref-default-instead-of-head' into 'master' · 6a1b17c4
  Douwe Maan authored Jul 02, 2018
```
Use root ref instead of HEAD to find latest repository commit

Closes gitlab-ee#5864

See merge request gitlab-org/gitlab-ce!20258
```
  6a1b17c4