Commits · 3601930154852c44cf1d03a5ba4d9fd59f32b81f · nexedi / gitlab-ce

27 Sep, 2018 4 commits

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-27 · 36019301

GitLab Bot authored Sep 27, 2018

# Conflicts:
#	app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
#	app/assets/javascripts/monitoring/components/dashboard.vue

[ci skip]

36019301

Merge branch 'ce-to-ee-2018-09-26' into 'master' · 07a8cea2
Stan Hu authored Sep 27, 2018
```
CE upstream - 2018-09-26 15:21 UTC

See merge request gitlab-org/gitlab-ee!7502
```
07a8cea2
Resolve conflicts in app/assets/javascripts/vue_merge_request_widget/dependencies.js · bd7db99f
Stan Hu authored Sep 26, 2018

bd7db99f

Merge branch... · 0d84dd22

Stan Hu authored Sep 27, 2018

Merge branch '51522-add-new-project-via-import-by-url-auto-populates-slug-but-not-project-name' into 'master'

Resolve "Add new project via import by URL auto populates slug but not project name"

Closes #51522

See merge request gitlab-org/gitlab-ce!21770

0d84dd22

26 Sep, 2018 36 commits
- Merge branch 'jivl-fix-monitoring-dashboard-resizing-navbar' into 'master' · 45a5a371
  Mike Greiling authored Sep 26, 2018
```
Fix monitoring dashboard not resizing properly

See merge request gitlab-org/gitlab-ce!21730
```
  45a5a371
- Merge branch 'ee-jivl-fix-monitoring-dashboard-resizing-navbar' into 'master' · b016feab
  Mike Greiling authored Sep 26, 2018
```
EE - Fix monitoring dashboard not working properly

See merge request gitlab-org/gitlab-ee!7377
```
  b016feab
- EE - Fix monitoring dashboard not working properly · 648c3e38
  Jose Ivan Vargas authored Sep 26, 2018
  
  648c3e38
- Merge branch '51299-update-grape' into 'master' · 54816512
  Sean McGivern authored Sep 26, 2018
```
Update grape to 1.1.0 to address a XSS vulnerability

Closes #51299

See merge request gitlab-org/gitlab-ce!21639
```
  54816512
- Merge branch 'jivl-fix-missing-import-skeleton-notes' into 'master' · 44311357
  Clement Ho authored Sep 26, 2018
```
Fix import statement for the skeleton notes

See merge request gitlab-org/gitlab-ce!21940
```
  44311357
- Fix import statement for the skeleton notes · 11e0a019
  Jose Vargas authored Sep 26, 2018
  
  11e0a019
- Merge branch 'jivl-bump-gitlab-ui' into 'master' · 40bf0460
  Clement Ho authored Sep 26, 2018
```
Bump GitLab UI version and change the file imports to a single point of entry notation

See merge request gitlab-org/gitlab-ce!21937
```
  40bf0460
- Merge branch 'winh-page-title-margin' into 'master' · 08133111
  Annabel Dunstone Gray authored Sep 26, 2018
```
Change vertical margin of page titles to 16px

See merge request gitlab-org/gitlab-ce!21888
```
  08133111
- Bump GitLab UI version and change the file imports to a single point of entry notation · 4bf85848
  Jose Vargas authored Sep 26, 2018
  
  4bf85848
- Merge branch 'weight_quick_action' into 'master' · 372b4654
  Mike Greiling authored Sep 26, 2018
```
Update possible values for weight quick action

See merge request gitlab-org/gitlab-ee!7498
```
  372b4654
- Merge branch 'feature/runner-type-filter-for-admin-view' into 'master' · 4586d77c
  Kamil Trzciński authored Sep 26, 2018
```
Feature: Runner type filter for admin view

See merge request gitlab-org/gitlab-ce!19649
```
  4586d77c
- Merge branch '51893-qa-fix-project-subgroup-dropdown-selector' into 'master' · 779169d3
  Rémy Coutable authored Sep 26, 2018
```
Update selectors for QA::Page::Group::Show

Closes #51893

See merge request gitlab-org/gitlab-ce!21925
```
  779169d3
- Merge branch '50289-unvendor-gitlab-ci-yml' into 'master' · ca0561f6
  Kamil Trzciński authored Sep 26, 2018
```
Resolve "Un-vendor CI templates"

Closes #50289

See merge request gitlab-org/gitlab-ce!21902
```
  ca0561f6
- Resolve "Un-vendor CI templates" · f5f5d6ea
  Dylan Griffith authored Sep 26, 2018
  
  f5f5d6ea
- Change vertical margin of page titles to 16px · 4e751964
  Winnie Hellmann authored Sep 24, 2018
  
  4e751964
- Merge branch 'align-epics-empty-state-buttons' into 'master' · e45d72b4
  Annabel Dunstone Gray authored Sep 26, 2018
```
Resolve "Align epics and roadmap empty state buttons to the center"

Closes #7574

See merge request gitlab-org/gitlab-ee!7358
```
  e45d72b4
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-26 · 16048080
  GitLab Bot authored Sep 26, 2018
```
# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js

[ci skip]
```
  16048080
- Merge branch 'dm-fix-assign-unassign-quick-actions' into 'master' · 82ea7195
  Rémy Coutable authored Sep 26, 2018
```
Don't ignore first action when assign and unassign quick actions are used in the same comment

See merge request gitlab-org/gitlab-ce!21749
```
  82ea7195
- Merge branch 'dm-fix-assign-unassign-quick-actions-ee' into 'master' · 0a30b12b
  Rémy Coutable authored Sep 26, 2018
```
Don't ignore first action when assign and unassign quick actions are used in the same comment [EE]

See merge request gitlab-org/gitlab-ee!7478
```
  0a30b12b
- Merge branch 'patch-29' into 'master' · 85f66f37
  Kamil Trzciński authored Sep 26, 2018
```
ci docs: clarify allow_failure default

See merge request gitlab-org/gitlab-ce!21791
```
  85f66f37
- Merge branch 'rename-squash-before-merge-vue-component' into 'master' · c052f5a9
  Phil Hughes authored Sep 26, 2018
```
Rename squash before merge vue component

See merge request gitlab-org/gitlab-ce!21851
```
  c052f5a9
- Merge branch 'ee-rename-squash-before-merge-vue-component' into 'master' · 003e9254
  Phil Hughes authored Sep 26, 2018
```
Rename squash before merge vue component

See merge request gitlab-org/gitlab-ee!7449
```
  003e9254
- Merge branch 'docs/add-artifact-file-url' into 'master' · a1529944
  Kamil Trzciński authored Sep 26, 2018
```
Add documentation for stable URLs for Artifacts

See merge request gitlab-org/gitlab-ce!21890
```
  a1529944
- Update selectors for QA::Page::Group::Show · 38b95a4f
  Mark Lapierre authored Sep 26, 2018
  
  38b95a4f
- Merge branch 'patch-25' into 'master' · 404b7802
  Marcia Ramos authored Sep 26, 2018
```
Docs: one-off typo fix

See merge request gitlab-org/gitlab-ce!21872
```
  404b7802
- Test correct assign and unassign behavior · 119ad568
  Douwe Maan authored Sep 25, 2018
  
  119ad568
- Make using assign and unassign quick actions together work as expected · 7a707573
  Douwe Maan authored Sep 14, 2018
  
  7a707573
- Make using assign and unassign quick actions together work as expected · 8811692c
  Douwe Maan authored Sep 14, 2018
  
  8811692c
- Merge branch 'ce-to-ee-2018-09-26' into 'master' · d728e315
  Filipa Lacerda authored Sep 26, 2018
```
CE upstream - 2018-09-26 12:21 UTC

See merge request gitlab-org/gitlab-ee!7496
```
  d728e315
- update possible values for weight quick action · 50750eb6
  Muhamed Huseinbašić authored Sep 26, 2018
  
  50750eb6
- Merge branch 'mk/backport-fix-safe-request-store-test' into 'master' · cfd2c31b
  Yorick Peterse authored Sep 26, 2018
```
[CE backport] Fix RequestStore-related EE-only test failure

See merge request gitlab-org/gitlab-ce!21915
```
  cfd2c31b
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-26 · 256f355b
  GitLab Bot authored Sep 26, 2018
  
  256f355b
- Merge branch 'docs-update-elasticsearch-url' into 'master' · ae2ca2f7
  Achilleas Pipinellis authored Sep 26, 2018
```
Update Elasticsearch URL description with example on using basic auth

Closes #4694

See merge request gitlab-org/gitlab-ee!7490
```
  ae2ca2f7
- Update Elasticsearch URL description with example on using basic auth · 1c2f37d0
  Collen authored Sep 26, 2018
  
  1c2f37d0
- Merge branch 'patch-28' into 'master' · 6c3c76af
  Achilleas Pipinellis authored Sep 26, 2018
```
uploads.md: Fix incorrect path reference

See merge request gitlab-org/gitlab-ce!21901
```
  6c3c76af
- Merge branch 'frozen-string-app-controllers-much-more' into 'master' · 4962bee8
  Rémy Coutable authored Sep 26, 2018
```
Enable even more frozen string in app/controllers

See merge request gitlab-org/gitlab-ce!21919
```
  4962bee8