# Conflicts:
#	scripts/lint-rugged

[ci skip]

CE upstream - 2018-01-25 14:09 UTC

Closes gitlab-qa#18

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

Fix rubocop offenses introduced in !16623

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

Fix spec/ee/spec/lib/gitlab/geo/health_check_spec.rb

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

fix documentation about node version

Closes #41438

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

Fix spec/ee/spec/lib/gitlab/geo/health_check_spec.rb

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

The Geo-related DB files were moved into an ee/ directory, which
caused this spec to fail.

Resolves #41438

Migrate restoring repo from bundle to Gitaly

Closes gitaly#946

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

Resolve "`only: - tags` is not taken in account in the `cache gems` job"

Closes #34952

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

Move user page spinach tests to RSpec

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

Move user page spinach tests to RSpec

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

Cache rubocop cache for CI

Closes #42338

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

Disable throwOnError in KaTeX to reveal user where is the problem

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

* master: (34 commits)
  Add a lint check to restrict use of Rugged, EE version
  Fix EE offenses to the RSpec/SingleLineHook cop
  Update qa.rb
  Use flash message instead of regular text block
  Update common.rb
  Update gitlab-styles and re-enable the RSpec/SingleLineHook cop again
  Move EE-specific migrations under ee/db/
  Make Gitlab::Git::Repository#run_git private
  Update secret_values to support dynamic elements within parent
  Improve PostgreSQL warning message in Rake task
  Improve warning message about the replication status
  Add a warning for Postgresql < 9.6 when show replication status
  Refactored expand_section to use name instead of selector
  Refactored view/element definition to dry up
  add view/element, some small fixes and code refactor
  Small fixes and codestyle changes
  Reduced rename replication spec steps to the bare minimum.
  Dont send enter key
  Refactor to address codestyle feedback
  Make AdvancedSettings a Page and move `rename_to to it.
  ...

Add a lint check to restrict use of Rugged

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

Add a lint check to restrict use of Rugged, EE version

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

Geo: Improve replication status. Using pg_stat_wal_receiver

Closes #3256

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

Handling special characters in Issuable Templates

Closes #40028

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

Make Gitlab::Git::Repository#run_git private

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

Make Gitlab::Git::Repository#run_git private, EE version

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

Improve empty project overview

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

Add Epic information for selected issue in Issue boards sidebar

Closes #4289

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

Update secret_values to support dynamic elements within parent -- EE merge edition

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

Update secret_values to support dynamic elements within parent

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

Fix conflicts for app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue

Fix conflicts for app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue

Fix conflicts for  app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue

Resolve "Re-enable the `RSpec/SingleLineHook` cop"

Closes #42385

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

[EE]  Resolve "Re-enable the `RSpec/SingleLineHook` cop"

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

https://gitlab.com/gitlab-org/gitlab-ce/issues/23036Signed-off-by: Rémy Coutable <remy@rymai.me>

Open links in a new tab on the user page

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

Move EE-specific migrations under ee/db/

Closes #3094

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

Geo project replication QA

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