Commits · 699874265d15f75cca69ec4584aca7815d209002 · nexedi / gitlab-ce

04 Dec, 2018 1 commit
- Update elasticsearch system check to check for new supported versions · 69987426
  Mario de la Ossa authored Dec 03, 2018
  
  69987426
03 Dec, 2018 39 commits
- Merge branch 'pass-class-active-record' into 'master' · f144d147
  Stan Hu authored Dec 03, 2018
```
Fix deprecation: Passing a class as a value in an Active Record query is deprecated

See merge request gitlab-org/gitlab-ee!8630
```
  f144d147
- Merge branch 'ce-to-ee-2018-12-03' into 'master' · 743749b6
  Clement Ho authored Dec 03, 2018
```
CE upstream - 2018-12-03 15:21 UTC

See merge request gitlab-org/gitlab-ee!8675
```
  743749b6
- Fix deprecation: Passing a class as a value in an Active Record query is... · e80889ec
  Jasper Maes authored Nov 28, 2018
```
Fix deprecation: Passing a class as a value in an Active Record query is deprecated and will be removed.
```
  e80889ec
- Resolve CE to EE of mr/mock_data · f8d5e735
  Paul Slaughter authored Dec 03, 2018
  
  f8d5e735
- Resolve CE to EE of mr_widget_pipeline · d434ce60
  Paul Slaughter authored Dec 03, 2018
  
  d434ce60
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-12-03 · def44543
  GitLab Bot authored Dec 03, 2018
```
# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
#	spec/javascripts/vue_mr_widget/mock_data.js

[ci skip]
```
  def44543
- Merge branch 'ce-6718_store_dependency_scanning_results_in_db' into 'master' · 59de4e8f
  Kamil Trzciński authored Dec 03, 2018
```
Update Dependency Scanning report fixtures

See merge request gitlab-org/gitlab-ce!23460
```
  59de4e8f
- Merge branch 'ce-to-ee-2018-12-01' into 'master' · f7f4112c
  Phil Hughes authored Dec 03, 2018
```
CE upstream - 2018-12-01 06:21 UTC

Closes gitlab-ce#51210

See merge request gitlab-org/gitlab-ee!8664
```
  f7f4112c
- Merge branch 'frozen-string-ee-app-helpers' into 'master' · e9cefd1e
  Rémy Coutable authored Dec 03, 2018
```
Enable some frozen string in ee/app

See merge request gitlab-org/gitlab-ee!8667
```
  e9cefd1e
- Merge branch 'mlapierre-master-patch-02698' into 'master' · 19ef77a1
  Rémy Coutable authored Dec 03, 2018
```
Update CONTRIBUTING.md: style guide link

See merge request gitlab-org/gitlab-ce!23481
```
  19ef77a1
- Merge branch 'qa-promote-issue-to-epic' into 'master' · 18bfce52
  Rémy Coutable authored Dec 03, 2018
```
Promoting issue to epic

Closes #7965

See merge request gitlab-org/gitlab-ee!8562
```
  18bfce52
- Promoting issue to epic · dc4e11e4
  Ramya Authappan authored Dec 03, 2018
  
  dc4e11e4
- Update CHANGELOG.md for 11.4.9 · 72dd09ca
  GitLab Release Tools Bot authored Dec 03, 2018
```
[ci skip]
```
  72dd09ca
- Update CHANGELOG.md for 11.4.9 · 01860413
  GitLab Release Tools Bot authored Dec 03, 2018
```
[ci skip]
```
  01860413
- Update CHANGELOG-EE.md for 11.4.9-ee · fdad17eb
  GitLab Release Tools Bot authored Dec 03, 2018
```
[ci skip]
```
  fdad17eb
- Merge branch '5426-fe-web-terminal-empty-state-ce' into 'master' · 9eb18d16
  Phil Hughes authored Dec 03, 2018
```
CE Port of "Add empty and disabled web terminal tab"

See merge request gitlab-org/gitlab-ce!23496
```
  9eb18d16
- CE Port of "Add empty and disabled web terminal tab" · fcdb6c19
  Paul Slaughter authored Dec 03, 2018
  
  fcdb6c19
- Update Dependency Scanning report fixtures · 2e9ce523
  Olivier Gonzalez authored Nov 29, 2018
```
Sync content with EE fixtures
```
  2e9ce523
- Merge branch '2122-transform-linked-into-button' into 'master' · b2f22b3f
  Phil Hughes authored Dec 03, 2018
```
Updates linked pipelines to render inline

Closes #2122

See merge request gitlab-org/gitlab-ee!8607
```
  b2f22b3f
- Updates linked pipelines to render inline · 738d27e8
  Filipa Lacerda authored Dec 03, 2018
  
  738d27e8
- Merge branch 'ce-2122-transform-linked-into-button' into 'master' · 2b1cac49
  Phil Hughes authored Dec 03, 2018
```
Reduces CE to EE differences

See merge request gitlab-org/gitlab-ce!23452
```
  2b1cac49
- Merge branch '1979-redesign-mr-widget-approvals' into 'master' · 60bb9eb4
  Phil Hughes authored Dec 03, 2018
```
Redesign of MR header sections

See merge request gitlab-org/gitlab-ee!8593
```
  60bb9eb4
- Redesign of MR header sections · 1c10fa21
  Paul Slaughter authored Dec 03, 2018
  
  1c10fa21
- Merge branch '1979-redesign-mr-widget-approvals-ce' into 'master' · d32f3680
  Phil Hughes authored Dec 03, 2018
```
Redesign of MR header sections (CE Port)

See merge request gitlab-org/gitlab-ce!23465
```
  d32f3680
- Run Prettier on app/assets/javascripts/notes/components/noteable_discussion.vue · 377044b4
  Winnie Hellmann authored Dec 03, 2018
  
  377044b4
- Add missing timeline-content to app/assets/javascripts/notes/components/noteable_discussion.vue · f76dc97b
  Winnie Hellmann authored Dec 03, 2018
  
  f76dc97b
- Merge branch 'improve_auto_devops_migration_debug' into 'master' · 8cd5004b
  Dmitriy Zaporozhets authored Dec 03, 2018
```
Add echo so that we know which branch was taken

See merge request gitlab-org/gitlab-ce!23499
```
  8cd5004b
- Run Prettier on app/assets/javascripts/notes/components/noteable_discussion.vue · c4dcab3b
  Winnie Hellmann authored Dec 03, 2018
  
  c4dcab3b
- Resolve conflicts in app/assets/javascripts/notes/components/noteable_discussion.vue · 1454b8c1
  Winnie Hellmann authored Dec 03, 2018
  
  1454b8c1
- Revert "Resolve app/assets/javascripts/notes/components/noteable_discussion.vue" · d001d0b9
  Winnie Hellmann authored Dec 03, 2018
```
This reverts commit dae7daa3.
```
  d001d0b9
- Merge branch 'fix-mr-widget-unrelated-deployment-status' into 'master' · 8a465b0c
  Kamil Trzciński authored Dec 03, 2018
```
Fix unrelated deployment status in MR widget

Closes #54125

See merge request gitlab-org/gitlab-ce!23175
```
  8a465b0c
- Merge branch '6718_store_dependency_scanning_results_in_db' into 'master' · d390f8f7
  Kamil Trzciński authored Dec 03, 2018
```
Parse and store dependency scanning results in database

See merge request gitlab-org/gitlab-ee!8642
```
  d390f8f7
- Parse and store dependency scanning results in database · 7be313f5
  Olivier Gonzalez authored Dec 03, 2018
  
  7be313f5
- Merge branch 'patch-31' into 'master' · 76d4e6d6
  Achilleas Pipinellis authored Dec 03, 2018
```
Update architecture.md

See merge request gitlab-org/gitlab-ce!23430
```
  76d4e6d6
- Merge branch 'jupyter-tls' into 'master' · 99289464
  Dmitriy Zaporozhets authored Dec 03, 2018
```
HTTPS for JupyterHub installation

See merge request gitlab-org/gitlab-ce!23479
```
  99289464
- HTTPS for JupyterHub installation · 9a034a86
  Amit Rathi authored Dec 03, 2018
  
  9a034a86
- Resolve app/assets/javascripts/notes/components/noteable_discussion.vue · dae7daa3
  George Tsiolis authored Dec 03, 2018
  
  dae7daa3
- Resolve app/assets/javascripts/notes/components/noteable_note.vue · d62108ad
  George Tsiolis authored Dec 03, 2018
  
  d62108ad
- Merge branch 'order-of-notification-settings' into 'master' · d2e280c4
  Sean McGivern authored Dec 03, 2018
```
reorder notification settings by noisy-ness

See merge request gitlab-org/gitlab-ce!23490
```
  d2e280c4