Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Cache column_exists? for Elasticsearch columns

Closes gitlab-ce#43355

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

CE upstream - 2018-03-16 09:25 UTC

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

Rename SAST for Docker to Container Scanning in EE documentation

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

Revert "Merge branch 'update-httparty' into 'master'"

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

Add slash command for moving an issue

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

CE upstream - 2018-03-16 06:40 UTC

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

CE upstream - 2018-03-15 19:01 UTC

Closes #5303

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

This reverts commit feb95ce3, reversing
changes made to 1b1475cb.

This reverts merge request !17737

[ci skip]

[ci skip]

[ci skip]

Any time a searchable object (e.g. issue, merge request, project, etc.)
is updated, the `after_commit` hook checks whetether two Elasticsearch
columns are present in the application_settings table. This leads to
unnecessary queries in production as the value can just be cached by
connection.

Closes gitlab-org/gitlab-ce#43355

Remove unnecessary ee project select vue file

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

Rename style to style guide in new frontend guide

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

# 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