# Conflicts:
#	Gemfile.lock
#	app/models/ci/build.rb
#	lib/gitlab/slash_commands/command.rb

[ci skip]

CE upstream - 2018-03-14 12:24 UTC

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

Fix import helper spec when a previous spec stubs settings

Closes gitlab-ee#5303

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

Fix import helper spec when a previous spec stubs settings

Closes gitlab-ee#5303

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

Add realtime pipeline status component for files

Closes #42927

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

Resolve "Reduce Redis usage from merge request diffs caching"

Closes #44191

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

This should use stub_omniauth_setting, not do it manually.

Drop jquery-rails gem from Gemfile

Closes #44306

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

Remove jquery-rails from Gemfile

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

Add labeled issues seed

Closes #41724

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

Add slash command for moving an issue

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

Manually escape '#' when building relative uris, closes #42459

Closes #42459

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

Carried over from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8857

Resolve "Follow-up from "Store lfs on object storage by default""

Closes #5167

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

Introduce CI/CD variables collection

Closes #33042

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

Remove RSpec warnings from `spec/models/ci/build_spec.rb`

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

Fix concurrency issue with migration for user_interacted_projects table.

Closes #44205

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

Add HTML style guide

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

This may lead to some being evicted and having to be cached again, but many MRs
get closed or updated in that time anyway.

Previously, we kept them all in the cache. We don't need the highlight results
for older diffs - if someone does view that (which is rare), we can do the
highlighting on the fly.

Add frontend guide principles

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

Add missing EE check for CI SAST view

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

Predefined variables collections / EE

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

Fix Scoped Boards bug filtering by No Milestone

Closes gitlab-ce#43317

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

Update README.md

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

Prevent sending an access request from failing when the project has invited masters/owners

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

Prevent hard-failing a mirror or sending an access request from failing when the project has invited masters/owners

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

Fix moving local, unhashed upload or pages directories during group transfer

Closes #43993

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

Issues List: Add tooltip to weight icon

Closes #5170

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

Add me as proofreader

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

add Indonesian proofreader

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

Fix validation error message when historical data is empty

Closes #5268

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

Prettier Phase 1: Prettier Configuration, Prettifying of files and documentation

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