* master: (151 commits)
  only return last_commit_sha in the JSON
  IDE sends last commit ID when committing changes
  Reuse viewer param and move logic to blob controller
  Removes unused imports and prettifies code
  Remove unexpected data store test suite
  Add ChatOps icon to docs
  Fix indentation for 'Current status' section
  Resolve docs conflicts
  Fix "[Rails5] '-1' is not a valid data_store"
  Changed the query string parameter to a string
  Remove scrollbar in Safari in repo settings page
  Resolve ""Click to expand" link in collapsed diffs should be blue"
  Fix missing dots from the CI job log output
  Fix template icons
  remove plural from 'label'
  Fix design artifact should not be removed
  Fixed linting error with trailing space in rb
  Fix node status badge alignment in mobile layout
  Fix node action buttons alignment
  Fix geo modal header
  ...

CE upstream - 2018-06-15 12:21 UTC

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

Resolve 3 "Extract EE specific files/lines for app/views/shared/issuable"

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

Fix flakey time-sensitive move slash command with unauthorized project -- EE merge edition

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

Fix "[Rails5] '-1' is not a valid data_store"

Closes #47369

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

IDE sends last commit ID when committing changes

Closes #46192

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

Removes unused imports and prettifies code

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

[CE backport] Backport InternalRedirect#sanitize_redirect

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

Closes #46192

Resolve "Make the html attribute on the blob json call optional"

Closes #46668

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

Fix flakey time-sensitive remove deploy key spec

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

CE upstream - 2018-06-15 09:21 UTC

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

Add ChatOps icon to docs

Closes gitlab-com/chatops#26

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

CE upstream - 2018-06-14 18:24 UTC

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

Fix indentation for 'Current status' section

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

Remove line regarding future feature of assigning ancestor group milestones

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

Fix flakey time-sensitive user/assignee autocomplete dropdown

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

Update process to create new design artifact issue

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

Remove scrollbar in Safari in repo settings page

Closes #47410

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

Fix missing dots from the CI job log output

Closes #47817

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

Closes #47410.

Fix use template buttons for creating a new project

Closes #47580

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

Resolve ""Click to expand" link in collapsed diffs should be blue"

Closes #47938

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

Resolve "Geo: bootstrap4 regressions"

Closes #6349

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