* master: (148 commits)
  Remove gaps under nav on build page
  Replace the 'project/snippets.feature' spinach test with an rspec analog
  Use correct group members path for members flyout link
  Replace the 'project/commits/revert.feature' spinach test with an rspec analog
  Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0'
  Replace the 'project/archived.feature' spinach test with an rspec analog
  Fix broken link in docs/api/wiki.md
  Fixed the new sidebars width when browser has scrollbars
  Improve 'spec/features/profiles/*' specs
  Replace the 'search.feature' spinach test with an rspec analog
  dedupe yarn packages
  add dependency approvals (all MIT license)
  update build image to latest with node 8.x, yarn 1.0.2, and chrome 61
  Ensure we use `Entities::User` for non-admin `users/:id` API requests
  Minor update to address Sean McGivern's comment.
  Add data migration
  Fix setting share_with_group_lock
  created services for keys
  Prepare Repository#merge for migration to Gitaly
  Never connect to webpack-dev-server over SSL
  ...

Minor update to address Sean McGivern's comment.

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

Replace the 'project/snippets.feature' spinach test with an rspec analog

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

Use correct group members path for members flyout link

Closes #37957

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

Fix broken link in docs/api/wiki.md

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

Prepare Repository#merge for migration to Gitaly

Closes gitaly#559

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

Never connect to webpack-dev-server over SSL in dev mode

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

Extract AutocompleteController#users into finder

Closes #24121

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

Replace the 'project/commits/revert.feature' spinach test with an rspec analog

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

Replace the 'project/archived.feature' spinach test with an rspec analog

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

Update build images

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

Improve 'spec/features/profiles/*' specs

Closes #37855 et #37856

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

Replace the 'search.feature' spinach test with an rspec analog

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

Clean up redirect routes that conflict with regular routes

Closes #36229

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

IssueNotes: Fix role badge styling.

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

Remove gaps under nav on build page

Closes #37857

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

Change Pipelines to CI/CD for Settings page

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

# Conflicts:
#   doc/ci/variables/README.md

Add Security Concerns section to reply by email documentation

[ci skip]

See merge request gitlab/gitlabhq!2191

Fixed the new sidebars width when browser has scrollbars

Closes #37606

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

Fix project feature being deleted when updating project with invalid visibility level

Closes #37640

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

Ensure we use `Entities::User` for non-admin `users/:id` API requests

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

 More details are available here https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13436/diffs#note_39115837

# Conflicts:
#   db/schema.rb

Use grpc 1.6.0

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

Fix setting share_with_group_lock

Closes #37916

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