Commits · 9f53ad3a618dd5e587a1fa00e9aefdead5adc0a1 · nexedi / gitlab-ce

29 Oct, 2018 17 commits
- Rails5: fix flaky mysql reset pipeline minutes spec · 9f53ad3a
  Jasper Maes authored Oct 28, 2018
  
  9f53ad3a
- Merge branch '5916-geo-handle-orphaned-uploads-records' into 'master' · 06ead455
  Douglas Barbosa Alexandre authored Oct 29, 2018
```
Geo: Handle orphaned Uploads records

Closes #5916

See merge request gitlab-org/gitlab-ee!8054
```
  06ead455
- Merge branch 'extract-ee-specific-lines-for-issues-and-mr-controllers' into 'master' · 0e921c7c
  Nick Thomas authored Oct 29, 2018
```
Extract EE-specific lines for issues and MR controllers

Closes #6668

See merge request gitlab-org/gitlab-ee!8062
```
  0e921c7c
- Merge branch 'fix_project_security_dashboard' into 'master' · 989d5661
  Grzegorz Bizon authored Oct 29, 2018
```
Fix Project Security Dasbhoard

See merge request gitlab-org/gitlab-ee!8072
```
  989d5661
- Fix Project Security Dasbhoard · aca3c900
  Olivier Gonzalez authored Oct 29, 2018
  
  aca3c900
- Merge branch '7103-show-milestone-dates-within-tooltips' into 'master' · c5f8a7df
  Phil Hughes authored Oct 29, 2018
```
Show actual Milestone dates within tooltips for Milestones in Epics sidebar

Closes #7103

See merge request gitlab-org/gitlab-ee!8048
```
  c5f8a7df
- Show actual Milestone dates within tooltips for Milestones in Epics sidebar · cbd67f5a
  Kushal Pandya authored Oct 29, 2018
  
  cbd67f5a
- Merge branch 'ee-ac-post-merge-pipeline' into 'master' · 5ba9095b
  Nick Thomas authored Oct 29, 2018
```
EE port of Post merge pipeline and environments status

See merge request gitlab-org/gitlab-ee!8104
```
  5ba9095b
- EE port of Post merge pipeline and environments status · 2fa0bda5
  Filipa Lacerda authored Oct 29, 2018
  
  2fa0bda5
- Merge branch 'ce-to-ee-2018-10-29' into 'master' · 42731d49
  🤖 GitLab Bot 🤖 authored Oct 29, 2018
```
CE upstream - 2018-10-29 10:21 UTC

See merge request gitlab-org/gitlab-ee!8127
```
  42731d49
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-29 · a83f79c0
  GitLab Bot authored Oct 29, 2018
  
  a83f79c0
- Merge branch... · 5a460397
  Grzegorz Bizon authored Oct 29, 2018
```
Merge branch '52780-stale-pipeline-status-cache-for-_project-after-disabling-pipelines' into 'master'

Resolve "Stale pipeline status cache for `_project` after disabling pipelines"

Closes #52780

See merge request gitlab-org/gitlab-ce!22589
```
  5a460397
- Merge branch 'issue_6944' into 'master' · f983def9
  Sean McGivern authored Oct 29, 2018
```
Resolve: When you add an issue to an epic that is already in the epic, you get erroneous system notes

Closes #6944

See merge request gitlab-org/gitlab-ee!8004
```
  f983def9
- Resolve: When you add an issue to an epic that is already in the epic, you get... · 0b774a6d
  Felipe Artur authored Oct 29, 2018
```
Resolve: When you add an issue to an epic that is already in the epic, you get erroneous system notes
```
  0b774a6d
- Merge branch 'tc-geo-dev-docs' into 'master' · 98a8e4d6
  Evan Read authored Oct 29, 2018
```
Write some Geo dev docs

Closes #7685

See merge request gitlab-org/gitlab-ee!7452
```
  98a8e4d6
- Write some Geo dev docs · 6cce6de0
  Toon Claes authored Oct 29, 2018
  
  6cce6de0
- Merge branch 'ce-to-ee-2018-10-28' into 'master' · b1df2b95
  🤖 GitLab Bot 🤖 authored Oct 29, 2018
```
CE upstream - 2018-10-28 23:21 UTC

See merge request gitlab-org/gitlab-ee!8123
```
  b1df2b95
28 Oct, 2018 10 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-28 · 35178923
  GitLab Bot authored Oct 28, 2018
  
  35178923
- Merge branch 'docs-fix-links-1-ee' into 'master' · 7e45c1ac
  Evan Read authored Oct 28, 2018
```
Update links to external sites (Port from CE)

See merge request gitlab-org/gitlab-ee!8066
```
  7e45c1ac
- Update links to external sites (Port from CE) · 5db46cf0
  Marcel Amirault authored Oct 28, 2018
  
  5db46cf0
- Merge branch 'docs-fix-links-1' into 'master' · b868b02c
  Evan Read authored Oct 28, 2018
```
Update links to external sites

See merge request gitlab-org/gitlab-ce!22578
```
  b868b02c
- Merge branch 'ce-to-ee-2018-10-28' into 'master' · e8390f63
  Stan Hu authored Oct 28, 2018
```
CE upstream - 2018-10-28 19:21 UTC

See merge request gitlab-org/gitlab-ee!8121
```
  e8390f63
- Resolve conflicts in app/models/commit_status.rb · ae303175
  Stan Hu authored Oct 28, 2018
  
  ae303175
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-28 · cb005bb1
  GitLab Bot authored Oct 28, 2018
```
# Conflicts:
#	app/models/commit_status.rb

[ci skip]
```
  cb005bb1
- Merge branch 'add-failure-reason-for-execution-timeout' into 'master' · 04184b32
  Kamil Trzciński authored Oct 28, 2018
```
Add failure reason for execution timeout

See merge request gitlab-org/gitlab-ce!22224
```
  04184b32
- Add failure reason for execution timeout · 4611a599
  Shinya Maeda authored Oct 28, 2018
  
  4611a599
- Merge branch 'ce-to-ee-2018-10-27' into 'master' · 472aa1e0
  🤖 GitLab Bot 🤖 authored Oct 28, 2018
```
CE upstream - 2018-10-27 17:21 UTC

See merge request gitlab-org/gitlab-ee!8118
```
  472aa1e0
27 Oct, 2018 7 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-27 · 7334482e
  GitLab Bot authored Oct 27, 2018
  
  7334482e
- Merge branch 'docs-autodevops-update' into 'master' · 8a116be4
  Mike Lewis authored Oct 27, 2018
```
remove duplicate section for enabling at project level

See merge request gitlab-org/gitlab-ce!22627
```
  8a116be4
- Merge branch 'docs-autodevops-update-ee' into 'master' · 453e6179
  Mike Lewis authored Oct 27, 2018
```
remove duplicate section for enable at project level

See merge request gitlab-org/gitlab-ee!8112
```
  453e6179
- Geo: Handle orphaned Uploads records · 14dab931
  Valery Sizov authored Oct 23, 2018
  
  14dab931
- Merge branch 'ce-to-ee-2018-10-26' into 'master' · 525cd053
  Stan Hu authored Oct 27, 2018
```
CE upstream - 2018-10-26 20:21 UTC

See merge request gitlab-org/gitlab-ee!8115
```
  525cd053
- Merge branch 'add_setup_cmd_section_to_lm' into 'master' · 8e321a22
  Philippe Lafoucrière authored Oct 27, 2018
```
Explain how to use custom setup cmd

See merge request gitlab-org/gitlab-ee!7680
```
  8e321a22
- Explain how to use custom setup cmd · 8bf58d36
  Philippe Lafoucrière authored Oct 27, 2018
  
  8bf58d36
26 Oct, 2018 6 commits
- Resolve doc/README.md · 02b0f15e
  Robert Speicher authored Oct 26, 2018
  
  02b0f15e
- Resolve lib/gitlab/checks/change_access.rb · 7dbaaa3e
  Robert Speicher authored Oct 26, 2018
  
  7dbaaa3e
- Clarify project-level enable/disable · 98690338
  Daniel Gruesso authored Oct 26, 2018
  
  98690338
- Clarify project-level enable/disable · c8e0f9d2
  Daniel Gruesso authored Oct 26, 2018
  
  c8e0f9d2
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-26 · 62a69cfa
  GitLab Bot authored Oct 26, 2018
```
# Conflicts:
#	doc/README.md
#	lib/gitlab/checks/change_access.rb

[ci skip]
```
  62a69cfa
- Merge branch 'ce-to-ee-2018-10-26' into 'master' · 3d1c2c26
  Mike Greiling authored Oct 26, 2018
```
CE upstream - 2018-10-26 16:28 UTC

Closes gitlab-qa#59

See merge request gitlab-org/gitlab-ee!8111
```
  3d1c2c26