CE upstream - 2018-06-13 09:24 UTC

Closes gitlab-qa#271 et gitaly#771

See merge request gitlab-org/gitlab-ee!6110

Fix spec failure by creating a project that has a repository in ee/spec/services/merge_requests/build_service_spec.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>

Document elasticsearch sizing requirements

Closes gitlab-elasticsearch-indexer#17

See merge request gitlab-org/gitlab-ee!6113

Drop ignored Geo repository_storage_path columns

See merge request gitlab-org/gitlab-ee!5468

Boost Geo prune worker to run every 2 hours instead of 6

Closes gitlab-com/infrastructure#4231

See merge request gitlab-org/gitlab-ee!6074

Signed-off-by: Rémy Coutable <remy@rymai.me>

EE: Updates eslint vue plugin version

See merge request gitlab-org/gitlab-ee!6080

* master:
  Assignee lists docs
  Fix parsing of vulnerabilities file lines
  Loosen the 'newly created MR' matcher
  Ensure we look into the correct setion only when expanding a settings' section

Assignee lists docs

See merge request gitlab-org/gitlab-ee!6099

# Conflicts:
#	app/views/admin/application_settings/_account_and_limit.html.haml
#	app/views/admin/application_settings/_ci_cd.html.haml
#	app/views/admin/application_settings/_email.html.haml
#	app/views/admin/application_settings/_help_page.html.haml
#	app/views/admin/application_settings/_repository_mirrors_form.html.haml
#	app/views/admin/application_settings/_signup.html.haml
#	app/views/admin/application_settings/_visibility_and_access.html.haml
#	lib/api/users.rb

[ci skip]

Resolve two QA failures

Closes gitlab-qa#271

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

[EE] Resolve two QA failures

Closes gitlab-qa#271

See merge request gitlab-org/gitlab-ee!6093

Fixed IDE jobs empty state showing when loading

Closes #47766

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

Fix parsing of vulnerabilities file lines

See merge request gitlab-org/gitlab-ee!6100

* master: (114 commits)
  Restoring user v3 endpoint
  Ee 44674 use one column form layout on admin area settings page
  Resolve "Add link to Jenkins integration page"
  Resolve "Participants tooltip is cutoff when too close to the window edge"
  Resolve conflicts in locale/gitlab.pot
  Resolve conflicts in doc/ci/variables/README.md
  Resolve conflicts in Gemfile.rails5.lock
  Fix group member filter layout
  Align nav bar items
  Fix labels too large
  Fix bootstrap popover class renames
  Added the correct checkbox markup for the push rules
  mergeError message has been binded using v-html directive
  Fixed IDE jobs empty state showing when loading
  Find and mark more Git disk access locations, part 2
  Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter
  i18n: document how to use links without splitting sentences
  Update HA docs for standby database nodes
  Ensure MR diffs always exist in the PR importer
  Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wiki/user_views_wiki_page_spec.rb"
  ...

Typo fix

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

Rails5 fix expected `issuable.reload.updated_at` to have changed

Closes #47366

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

[Rails5] Pass class references instead of strings to middleware builder

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

Resolve "`MigrateUploadsWorker` is doing N+1 queries on migration"

Closes #47408

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

Migrate compare_source_branch to use only Gitaly

Closes gitaly#771

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

Restoring user v3 endpoint

See merge request gitlab-org/gitlab-ee!6091

Restoring user v3 endpoint

Closes #47565

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

Resolve "Microsoft Teams notification for pipelines do not work"

Closes #42342

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

Added with_stats option to GET /projects/:id/repository/commits (API)

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

Resolve "Use one column form layout on Admin Area Settings page"

Closes #44674

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

Ee 44674 use one column form layout on admin area settings page

Closes gitlab-ce#44674

See merge request gitlab-org/gitlab-ee!6087

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>