Commits · 0b99d481dfdcc79f3f579f3cc1a1f45412e08fa0 · nexedi / gitlab-ce

22 Feb, 2018 40 commits
- Merge branch 'ce-to-ee-2018-02-22' into 'master' · 0b99d481
  Clement Ho authored Feb 22, 2018
```
CE upstream - 2018-02-22 18:24 UTC

Closes #4998

See merge request gitlab-org/gitlab-ee!4683
```
  0b99d481
- Merge branch 'add-license-id-to-usage-ping' into 'master' · c3226fe7
  Rubén Dávila authored Feb 22, 2018
```
Add license ID number to usage ping

See merge request gitlab-org/gitlab-ee!4679
```
  c3226fe7
- Merge branch 'bye-bye-ee-import' into 'master' · e4322445
  Jacob Schatz authored Feb 22, 2018
```
Remove ee dynamic imports

See merge request gitlab-org/gitlab-ee!4680
```
  e4322445
- Remove ee dynamic imports · e5b9b8c3
  Clement Ho authored Feb 22, 2018
  
  e5b9b8c3
- resolve personal_file_uploader.rb · 01299627
  Micaël Bergeron authored Feb 22, 2018
  
  01299627
- Update CHANGELOG.md for 10.5.1 · 2c258dbe
  Ian Baum authored Feb 22, 2018
```
[ci skip]
```
  2c258dbe
- Update CHANGELOG-EE.md for 10.5.1-ee · e65df3f1
  Ian Baum authored Feb 22, 2018
```
[ci skip]
```
  e65df3f1
- Fix conflict in app/uploaders/personal_file_uploader.rb · 05a2a62e
  Clement Ho authored Feb 22, 2018
  
  05a2a62e
- Fix conflict in doc/user/project/milestones/index.md · 18470a38
  Clement Ho authored Feb 22, 2018
  
  18470a38
- Fix conflict in doc/user/project/milestones/index.md · 68843a6a
  Clement Ho authored Feb 22, 2018
  
  68843a6a
- Merge branch 'master' into 'ce-to-ee-2018-02-22' · 52fa7a63
  Clement Ho authored Feb 22, 2018
```
# Conflicts:
#   app/assets/javascripts/dispatcher.js
#   doc/user/project/milestones/index.md
```
  52fa7a63
- Merge branch 'ee-dispatcher-import-batch-3' into 'master' · 42c2dfb2
  Fatih Acet authored Feb 22, 2018
```
Use dynamic imports in dispatcher (Part 3) (EE)

See merge request gitlab-org/gitlab-ee!4663
```
  42c2dfb2
- Merge branch 'docs-burndown-charts-milestones' into 'master' · 298dad2b
  Marcia Ramos authored Feb 22, 2018
```
Burndown chart docs update

See merge request gitlab-org/gitlab-ee!4681
```
  298dad2b
- Burndown chart docs update · 8219d767
  Victor Wu authored Feb 22, 2018
  
  8219d767
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-22 · 7aa5df69
  GitLab Bot authored Feb 22, 2018
```
# Conflicts:
#	app/assets/javascripts/dispatcher.js
#	app/uploaders/personal_file_uploader.rb
#	doc/user/project/milestones/index.md

[ci skip]
```
  7aa5df69
- Merge branch 'dispatcher-import-batch-3' into 'master' · f330f659
  Jacob Schatz authored Feb 22, 2018
```
Use dynamic imports in dispatcher (Part 3)

See merge request gitlab-org/gitlab-ce!17277
```
  f330f659
- Use dynamic imports in dispatcher (Part 3) · 4317f5a4
  Clement Ho authored Feb 22, 2018
  
  4317f5a4
- Merge branch 'ce-to-ee-2018-02-22' into 'master' · 27a77b8b
  Clement Ho authored Feb 22, 2018
```
CE upstream - 2018-02-22 15:26 UTC

Closes #4975 and gitlab-com/infrastructure#3734

See merge request gitlab-org/gitlab-ee!4676
```
  27a77b8b
- Add license ID number to usage ping · 0e6d9d1a
  Sean McGivern authored Feb 22, 2018
```
This can be used for more accurate matching than the MD5.
```
  0e6d9d1a
- Merge branch 'patch-28' into 'master' · 9251d1f3
  Marcia Ramos authored Feb 22, 2018
```
Add link to project visibility settings in push to create project docs

See merge request gitlab-org/gitlab-ce!17292
```
  9251d1f3
- Merge branch 'docs-milestones-refactor' into 'master' · 5bfeca40
  Marcia Ramos authored Feb 22, 2018
```
Docs milestones refactor

See merge request gitlab-org/gitlab-ce!17247
```
  5bfeca40
- Merge branch 'docs-milestones-refactor-ee' into 'master' · 4018a57c
  Marcia Ramos authored Feb 22, 2018
```
Docs milestones refactor EE

See merge request gitlab-org/gitlab-ee!4674
```
  4018a57c
- Docs milestones refactor EE · 2eb68947
  Victor Wu authored Feb 22, 2018
  
  2eb68947
- Resolve bad conflict for dispatcher · 479f0028
  Clement Ho authored Feb 22, 2018
  
  479f0028
- Merge branch '4723-add-option-to-overwrite-diverged-branches-when-pull-mirroring' into 'master' · 84805b4e
  Douwe Maan authored Feb 22, 2018
```
Resolve "Add option to overwrite diverged branches when pull mirroring"

Closes #4723

See merge request gitlab-org/gitlab-ee!4559
```
  84805b4e
- Merge branch 'docs-replace-prod-names' into 'master' · c679fa16
  🚄 Job van der Voort 🚀 authored Feb 22, 2018
```
Docs: search/replace "Enterprise Edition" and adjust when applicable

See merge request gitlab-org/gitlab-ce!17161
```
  c679fa16
- Docs: search/replace "Enterprise Edition" and adjust when applicable · 650d11be
  Marcia Ramos authored Feb 22, 2018
  
  650d11be
- Merge branch 'docs-replace-prod-names-ee' into 'master' · 217f6f04
  🚄 Job van der Voort 🚀 authored Feb 22, 2018
```
Docs: search/replace "Enterprise Edition" and adjust when applicable

See merge request gitlab-org/gitlab-ee!4576
```
  217f6f04
- Docs: search/replace "Enterprise Edition" and adjust when applicable · 6b99f9ef
  Marcia Ramos authored Feb 22, 2018
  
  6b99f9ef
- Merge branch 'fix-500-for-invalid-upload-path' into 'master' · 05f4788e
  Sean McGivern authored Feb 22, 2018
```
Fix 500 error when loading an invalid upload URL

Closes gitlab-ee#4998

See merge request gitlab-org/gitlab-ce!17267
```
  05f4788e
- Merge branch 'ee-fix-500-for-invalid-upload-path' into 'master' · 394811fe
  Sean McGivern authored Feb 22, 2018
```
Fix 500 error when loading an invalid upload URL

See merge request gitlab-org/gitlab-ee!4673
```
  394811fe
- Merge branch 'revert-3487441b' into 'master' · 2d004982
  Sean McGivern authored Feb 22, 2018
```
Revert "Merge branch 'tc-info-version-check' into 'master'"

See merge request gitlab-org/gitlab-ce!17269
```
  2d004982
- Merge branch '43416-document-where-user-clone-fetch-activity-appears-in-the-logs' into 'master' · b5306075
  Achilleas Pipinellis (🌴 Feb 23 - Mar 04 🌴) authored Feb 22, 2018
```
Resolve "document where user clone/fetch activity appears in the logs"

Closes #43416

See merge request gitlab-org/gitlab-ce!17227
```
  b5306075
- Resolve conflict in app/assets/javascripts/dispatcher.js · 1a35899f
  Rémy Coutable authored Feb 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1a35899f
- Resolve conflict in config/webpack.config.js · f941ce0b
  Rémy Coutable authored Feb 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f941ce0b
- Resolve conflicts with ee/changelogs/unreleased files · d3bb4f5a
  Rémy Coutable authored Feb 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d3bb4f5a
- Resolve conflict in app/assets/javascripts/labels_select.js · 1a93fbe6
  Rémy Coutable authored Feb 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1a93fbe6
- Resolve conflict in app/assets/javascripts/gl_dropdown.js · 93c4552b
  Rémy Coutable authored Feb 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  93c4552b
- Resolve conflict in CHANGELOG-EE.md and CHANGELOG.md · 018b9233
  Rémy Coutable authored Feb 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  018b9233
- Adds option to overwrite a diverged branch when mirroring · 1800a854
  Tiago Botelho authored Feb 15, 2018
  
  1800a854