* 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

[EE] Resolve two QA failures

Closes gitlab-qa#271

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

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"
  ...

Restoring user v3 endpoint

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

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>

Resolve "Add link to Jenkins integration page"

Closes #5903

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

CE upstream - 2018-06-13 03:32 UTC

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

Resolve "Groups > Members > No padding between dropdowns/input"

Closes #46702

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

CE upstream - 2018-06-13 00:21 UTC

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

CE upstream - 2018-06-12 17:46 UTC

Closes #6382

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

Resolve "Participants tooltip is cutoff when too close to the window edge"

Closes #47551

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

Resolve "Admin area > Push rules > Checkboxes"

Closes #6210

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

Fix bootstrap popover class renames

Closes gitlab-ce#47727

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

Resolve "Project search in navbar is missing top margin in dev.gitlab.com"

Closes #47773

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

Clean up stale Prometheus metrics in before_exec unicorn hook

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

Resolve "Alignment of labels within two column layouts for radio and check boxes"

Closes #47265

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

Fix labels too large

Closes #47499 and #47762

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

# Conflicts:
#	Gemfile.rails5.lock
#	doc/ci/variables/README.md
#	locale/gitlab.pot

[ci skip]

Fixed IDE jobs empty state showing when loading

Closes #47766

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