delta/gitlab/gitlab-ce.git, branch fl-update-registry-code

[ci skip] Merge branch 'master' into fl-update-registry-code

2018-06-18T10:44:55+00:00

* master: (68 commits)
  Render calendar feed inline when accessed from GitLab
  Make Gitaly wiki RPC's mandatory
  Remove the ci_job_request_with_tags_matcher
  Optimised paused runners to not re-query every 3s
  [Rails5] Set request.format for artifacts_controller
  [Rails5] Fix sessions_controller_spec
  Rails5 update Gemfile.rails5.lock
  [Rails5] Fix pipeline_schedules_controller_spec
  Fix milestones disappearing when changed on MR
  Harmonize theme preferences previews
  Resolve "Wiki git clone holder and dropdown is broken"
  Resolve "Update link in GitLab cluster setup form to say "see pricing""
  Resolve "Misalignment in rows on comparison page"
  Resolve "Stop horizontal scrolling when clicking on board issue"
  Enable no-multi-assignment in JS files
  Fix ci mini graph dropdown alignment and positioning
  Remove additional border from the create project page
  Fix alert colors
  Enable display static for ci job dropdowns so that they dont move when window resizes
  Remove pointer events in favor of boundary viewport
  ...

Merge branch '47672-set_inline_content_type_for_ics' into 'master'

2018-06-18T09:35:20+00:00

Render calendar feed inline when accessed from GitLab

Closes #47672

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

Merge branch 'blackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404' into 'master'

2018-06-18T09:22:57+00:00

Resolve "[Rails5] expected the response to have status code :ok but it was 404"

Closes #48008

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

Merge branch 'rails5-fix-48009' into 'master'

2018-06-18T09:20:07+00:00

Rails5 update Gemfile.rails5.lock

Closes #48009

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

Merge branch 'blackst0ne-rails5-expected-search-search-seed_project-got-nil' into 'master'

2018-06-18T09:19:40+00:00

Resolve "[Rails5] expected: "/search?search=seed_project" got: nil"

Closes #48013

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

Merge branch 'blackst0ne-rails5-fix-pipeline-schedules-controller-spec' into 'master'

2018-06-18T09:18:32+00:00

[Rails5] Fix pipeline_schedules_controller_spec

Closes #48011

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

Merge branch 'expose-clean-backtrace-method-from-profiler' into 'master'

2018-06-18T09:02:42+00:00

Expose a clean_backtrace method from Gitlab::Profiler

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

Merge branch 'rails5-fix-47960' into 'master'

2018-06-18T08:58:23+00:00

Rails5 fix update_attribute usage not causing a save

Closes #47960

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

Merge branch 'blackst0ne-rails5-fix-blob-requests-format' into 'master'

2018-06-18T08:56:12+00:00

[Rails5] Explicitly set request.format for blob_controller

Closes #47921

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

Render calendar feed inline when accessed from GitLab

2018-06-18T08:53:52+00:00

With text/calendar as Content-Type, the browser always downloads the
content as a file (even ignoring the Content-Disposition header). We
want to display the content inline when accessed from GitLab, similarly
to the RSS feed.