Commits · 1f6bf22c8deceb8b50a6a45be66cef812bd67b0a · nexedi / gitlab-ce

06 Sep, 2018 40 commits
- EE Port for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21172 · 1f6bf22c
  Mayra Cabrera authored Sep 06, 2018
  
  1f6bf22c
- Merge branch... · 15b3b8f8
  Stan Hu authored Sep 06, 2018
```
Merge branch '7419-running-git-clone-with-a-secondary-geo-node-url-has-lfs-batch-download-redirected-to-primary' into 'master'

Resolve "Running git clone with a secondary geo node URL has LFS batch download redirected to primary"

Closes #7419

See merge request gitlab-org/gitlab-ee!7209
```
  15b3b8f8
- Merge branch 'ce-to-ee-2018-09-06' into 'master' · 9f5cec02
  Stan Hu authored Sep 06, 2018
```
CE upstream - 2018-09-06 15:24 UTC

See merge request gitlab-org/gitlab-ee!7271
```
  9f5cec02
- Merge branch 'ee-43140-reduce-logs-tree-load' into 'master' · 6bcefd66
  Rémy Coutable authored Sep 06, 2018
```
Bulk-render commit titles in the tree view to improve performance: EE version

See merge request gitlab-org/gitlab-ee!7234
```
  6bcefd66
- regen gitlab.pot · ca8dfd8f
  Luke Bennett authored Sep 06, 2018
  
  ca8dfd8f
- Merge branch 'unit_tests_for_disabled_wiki' into 'master' · 9cfdef2f
  Douglas Barbosa Alexandre authored Sep 06, 2018
```
Add spec to check that geo can download code from private repository

See merge request gitlab-org/gitlab-ee!7235
```
  9cfdef2f
- Merge branch '6959-add-epic-quick' into 'master' · a7b0c5d5
  Sean McGivern authored Sep 06, 2018
```
Quick action to add/remove issue to epic from issue

Closes #6959

See merge request gitlab-org/gitlab-ee!6934
```
  a7b0c5d5
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-06 · 4bbe659f
  GitLab Bot authored Sep 06, 2018
```
# Conflicts:
#	locale/gitlab.pot

[ci skip]
```
  4bbe659f
- Properly fix an introduced N+1 SQL issue loading commit authors · 3f6a97b8
  Nick Thomas authored Sep 05, 2018
  
  3f6a97b8
- Add changelog · f4abb47e
  Nick Thomas authored Sep 04, 2018
  
  f4abb47e
- Extract tree summary logic out of RefsController#logs_tree · 57fe6411
  Nick Thomas authored Sep 04, 2018
  
  57fe6411
- Merge branch 'fix-closing-issues' into 'master' · 607a2562
  Sean McGivern authored Sep 06, 2018
```
Fix closing issue default pattern

Closes #51085

See merge request gitlab-org/gitlab-ce!21531
```
  607a2562
- Fix closing issue default pattern · c6cfc369
  Samuele Kaplun authored Sep 05, 2018
```
* (Suf)fix #51085 :-)
Signed-off-by: Samuele Kaplun <kaplun@protonmail.com>
```
  c6cfc369
- Merge branch 'ce-to-ee-2018-09-06' into 'master' · 2037dfd0
  Bob Van Landuyt authored Sep 06, 2018
```
CE upstream - 2018-09-06 12:23 UTC

See merge request gitlab-org/gitlab-ee!7267
```
  2037dfd0
- Resolve conflicts in kubernetes.rb · 427d087b
  Bob Van Landuyt authored Sep 06, 2018
  
  427d087b
- Fix conflicts in blob/_blob.html.haml · 91baf032
  Bob Van Landuyt authored Sep 06, 2018
  
  91baf032
- Merge branch 'docs-protected-environments' into 'master' · e990ad23
  Achilleas Pipinellis authored Sep 06, 2018
```
Add documentation for Protected Environments

Closes #7485

See merge request gitlab-org/gitlab-ee!6725
```
  e990ad23
- Merge branch '50567-remove-usage-ping-payload-from-cohorts-add-to-settings' into 'master' · bac9a1dd
  Phil Hughes authored Sep 06, 2018
```
Resolve "Remove usage ping payload from Cohorts, add to Settings"

Closes #50567

See merge request gitlab-org/gitlab-ce!21343
```
  bac9a1dd
- Resolve "Remove usage ping payload from Cohorts, add to Settings" · 7e7ca9fa
  Luke Bennett authored Sep 06, 2018
  
  7e7ca9fa
- Copyedit protected environments docs · db367ede
  Achilleas Pipinellis authored Sep 06, 2018
  
  db367ede
- Merge branch 'feature/recognize-unlicense' into 'master' · 55b52640
  Rémy Coutable authored Sep 06, 2018
```
Recognize 'UNLICENSE' license files

See merge request gitlab-org/gitlab-ce!21508
```
  55b52640
- Recognize 'UNLICENSE' license files · 643c6f31
  J.D. Bean authored Sep 06, 2018
  
  643c6f31
- Quick action for adding/removing epic to issues · 8b8c552e
  Jarka Kadlecová authored Aug 14, 2018
  
  8b8c552e
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-06 · c4045b32
  GitLab Bot authored Sep 06, 2018
```
# Conflicts:
#	app/models/clusters/platforms/kubernetes.rb
#	app/views/projects/blob/_blob.html.haml

[ci skip]
```
  c4045b32
- Merge branch '51117-send-terminal-path-in-job-api' into 'master' · 4a14ff5b
  Kamil Trzciński authored Sep 06, 2018
```
Add terminal path to job API response

Closes #51117

See merge request gitlab-org/gitlab-ce!21537
```
  4a14ff5b
- Merge branch '51092-fix-mr-diff-file-filter-clear-button' into 'master' · 0bbea6da
  Phil Hughes authored Sep 06, 2018
```
Make MR diff file filter input Clear button functional

Closes #51092

See merge request gitlab-org/gitlab-ce!21556
```
  0bbea6da
- Make MR diff file filter input Clear button functional · 97b5ea02
  Kushal Pandya authored Sep 06, 2018
  
  97b5ea02
- Merge branch 'dz-maven-packages-api-ci-job-token' into 'master' · fcaf056f
  Kamil Trzciński authored Sep 06, 2018
```
Add CI Job token support to Maven packages API

See merge request gitlab-org/gitlab-ee!7249
```
  fcaf056f
- Add CI Job token support to Maven packages API · a3a3c2ff
  Dmitriy Zaporozhets authored Sep 06, 2018
  
  a3a3c2ff
- Merge branch 'feature/git-v2-flag' into 'master' · 2f0a0761
  Nick Thomas authored Sep 06, 2018
```
Add git_v2 flag to GitalyClient

See merge request gitlab-org/gitlab-ce!21520
```
  2f0a0761
- Add git_v2 flag to GitalyClient · c6c6de8a
  James Lopez authored Sep 06, 2018
  
  c6c6de8a
- Add terminal path to job API response · 26f577df
  Steve Azzopardi authored Sep 05, 2018
```
closes #51117
```
  26f577df
- Merge branch 'sh-fix-attachments-inline' into 'master' · abc2caaa
  Nick Thomas authored Sep 06, 2018
```
Fix attachments not displaying inline with Google Cloud Storage

Closes #49957

See merge request gitlab-org/gitlab-ce!21265
```
  abc2caaa
- Merge branch 'pl-fix-ce-ee-upgrade-link-docs' into 'master' · 586fc584
  Marcia Ramos authored Sep 06, 2018
```
Docs: Point "upgrade to EE" link to a dedicated page

See merge request gitlab-org/gitlab-ee!7266
```
  586fc584
- Deduplicate commits before rendering them in RefsController#logs_tree · ef30dcd6
  Nick Thomas authored Sep 04, 2018
  
  ef30dcd6
- Bulk-render commit titles in the tree view to improve performance · ebbb3a27
  Nick Thomas authored Sep 04, 2018
  
  ebbb3a27
- Merge branch 'ash.mckenzie/geo-git-push-ssh-proxy' into 'master' · 228d819b
  Sean McGivern authored Sep 06, 2018
```
Custom Action support

See merge request gitlab-org/gitlab-ce!21034
```
  228d819b
- Merge branch 'ce-to-ee-2018-09-06' into 'master' · 1b69145d
  Bob Van Landuyt authored Sep 06, 2018
```
CE upstream - 2018-09-06 09:22 UTC

See merge request gitlab-org/gitlab-ee!7264
```
  1b69145d
- Merge branch 'bvl-codeowners-file-ce' into 'master' · 98ae35a8
  Douwe Maan authored Sep 06, 2018
```
Port changes for CODEOWNERS to CE

See merge request gitlab-org/gitlab-ce!21309
```
  98ae35a8
- Merge branch 'bvl-codeowners-file' into 'master' · 5e741e4c
  Douwe Maan authored Sep 06, 2018
```
Extract code owners from a CODEOWNERS file

Closes #6961

See merge request gitlab-org/gitlab-ee!6916
```
  5e741e4c