Commits · e8390f63c787705305bee0bcb6b4bc2e65e69f49 · nexedi / gitlab-ce

28 Oct, 2018 6 commits
- 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 6 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
- 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 28 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
- Resolve conflict in app/assets/javascripts/monitoring/components/dashboard.vue · 8ad1d303
  Mike Greiling authored Oct 26, 2018
  
  8ad1d303
- Merge branch '51335-fail-early-when-user-cannot-be-identified' into 'master' · e997b22d
  Douwe Maan authored Oct 26, 2018
```
User not defined in PostReceive#process_project_changes

Closes #51335

See merge request gitlab-org/gitlab-ce!22519
```
  e997b22d
- Merge branch 'ee-42790-improve-feedback-for-internal-git-access-checks-timeouts' into 'master' · 057b4ce9
  Douwe Maan authored Oct 26, 2018
```
Adds tracing messages for slow git pushes

See merge request gitlab-org/gitlab-ee!8041
```
  057b4ce9
- Merge branch '42790-improve-feedback-for-internal-git-access-checks-timeouts' into 'master' · f2e9148d
  Douwe Maan authored Oct 26, 2018
```
Adds trace of each access check when git push times out

Closes #42790

See merge request gitlab-org/gitlab-ce!22265
```
  f2e9148d
- Merge branch 'pl-uprade-prometheus-alertmanager' into 'master' · 578064df
  Douwe Maan authored Oct 26, 2018
```
Upgrade Prometheus to 2.4.3 and Alertmanager to 0.15.2

See merge request gitlab-org/gitlab-ce!22600
```
  578064df
- Resolve conflict in ee_switch_state_maps.js · 600e1b0e
  Winnie Hellmann authored Oct 26, 2018
  
  600e1b0e
- Resolve conflict in ee_switch_mr_widget_store.js · c0864cab
  Winnie Hellmann authored Oct 26, 2018
  
  c0864cab
- Resolve conflict in ee_switch_get_state_key.js · 071c4d46
  Winnie Hellmann authored Oct 26, 2018
  
  071c4d46
- Resolve conflict in ee_switch_mr_widget_service.js · ba8932b2
  Winnie Hellmann authored Oct 26, 2018
  
  ba8932b2
- Resolve conflict in ee_switch_mr_widget_options.js · 93e9966a
  Winnie Hellmann authored Oct 26, 2018
  
  93e9966a
- Merge branch '7872-license-management-dropdowns-are-broken-in-firefox' into 'master' · 05960e43
  Clement Ho authored Oct 26, 2018
```
Fix button rendering in license management in FF

Closes #7872

See merge request gitlab-org/gitlab-ee!8046
```
  05960e43
- remove duplicate section for enable at project level · 8b3d47f7
  Daniel Gruesso authored Oct 26, 2018
  
  8b3d47f7
- remove duplicate section for enabling at project level · 60170262
  Daniel Gruesso authored Oct 26, 2018
  
  60170262
- Merge branch 'docs-add-runbooks' into 'master' · 238d9d38
  Mike Lewis authored Oct 26, 2018
```
docs add first draft for runbook topic

See merge request gitlab-org/gitlab-ce!22588
```
  238d9d38
- Merge branch 'docs-add-runbooks-ee' into 'master' · 90775302
  Mike Lewis authored Oct 26, 2018
```
docs add runbooks topic ee

See merge request gitlab-org/gitlab-ee!8075
```
  90775302
- relocate runbooks under clusters folder · 83ff9b4a
  danielgruesso authored Oct 26, 2018
  
  83ff9b4a
- update issue link · 8883f6e1
  Daniel Gruesso authored Oct 26, 2018
  
  8883f6e1
- update runbooks link · 66fc35f7
  Daniel Gruesso authored Oct 26, 2018
  
  66fc35f7
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-26 · 68985a90
  GitLab Bot authored Oct 26, 2018
```
# Conflicts:
#	app/assets/javascripts/monitoring/components/dashboard.vue
#	app/assets/javascripts/vue_merge_request_widget/ee_switch_mr_widget_options.js
#	app/assets/javascripts/vue_merge_request_widget/services/ee_switch_mr_widget_service.js
#	app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_get_state_key.js
#	app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_mr_widget_store.js
#	app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_state_maps.js

[ci skip]
```
  68985a90
- Merge branch 'ce-to-ee-2018-10-26' into 'master' · 2a55f04b
  🤖 GitLab Bot 🤖 authored Oct 26, 2018
```
CE upstream - 2018-10-26 15:21 UTC

See merge request gitlab-org/gitlab-ee!8110
```
  2a55f04b
- Merge branch 'docs-add-runbooks' of gitlab.com:gitlab-org/gitlab-ce into docs-add-runbooks · ca17c1e4
  danielgruesso authored Oct 26, 2018
```
# Conflicts:
#	doc/topics/runbooks/index.md
```
  ca17c1e4
- Merge branch 'mlapierre-master-patch-62130' into 'master' · d795f268
  Marin Jankovski authored Oct 26, 2018
```
Update review apps testing guide

See merge request gitlab-org/gitlab-ce!22619
```
  d795f268