# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
#	config/gitlab.yml.example
#	config/initializers/0_post_deployment_migrations.rb

[ci skip]

Moves components into vue files:

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

Moves components into vue files:

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

Merge branch '42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-ico' into 'master'

Port some non-EE-specific config/ changes to CE

Closes #42420

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

Backport QA changes from EE

Closes gitlab-ee#4698

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

gitlab-qa !155 - push creates event on activity page

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

* master: (76 commits)
  Add changelog entry
  Include mock replication slot WAL
  Hide sync status when event timestamp is not present
  Show empty state when timestamp is not present
  Update common.rb
  Merge branch 'qa-secret-variables-scenario' into tmp
  Just don't expand if it's already expanded
  Use `numberToHumanSize` for memory unit conversion
  Add multiple steps to limitations.
  Resolve scripts/lint-rugged conflicts
  fix bug in webpack_helper in which force_same_domain argument was ignored breaking local rspec tests
  Merge branch 'sh-fix-geo-migration-path' into 'master'
  Fix rubocop offenses introduced in !16623
  Fix spec/ee/spec/lib/gitlab/geo/health_check_spec.rb
  fix documentation about node version
  Ensure the  job also run for tags
  Fix broken paths
  Fix conflicts for app/assets/javascripts/vue_merge_request_widget/dependencies.js
  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
  ...

Handle empty event timestamp and larger memory units

Closes #4653 and #4664

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

CE upstream - 2018-01-26 09:24 UTC

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

Make sure that axios adapater is restored after mocking

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

* upstream/master:
  Just don't expand if it's already expanded
  fix bug in webpack_helper in which force_same_domain argument was ignored breaking local rspec tests
  Fix rubocop offenses introduced in !16623
  Prefer local variables over given/let
  Try to restore page's state
  Add more views check
  Respect the latest changes from master
  Add a scenario for adding secret variables

# Conflicts:
#	qa/qa/page/project/settings/common.rb

[ci skip]

EE: Add a scenario for adding secret variables

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

Add a scenario for adding secret variables

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

Merge branch 'ee-42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-ico' into 'master'

Move an EE-specific queue to the EE-specific queues part

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

* qa-secret-variables-scenario:
  Just don't expand if it's already expanded
  Prefer local variables over given/let
  Try to restore page's state
  Add more views check
  Respect the latest changes from master
  Add a scenario for adding secret variables

* upstream/master:
  fix bug in webpack_helper in which force_same_domain argument was ignored breaking local rspec tests
  Fix rubocop offenses introduced in !16623
  fix documentation about node version
  Ensure the  job also run for tags
  Open links in a new tab on the user page
  Improve empty project overview
  Look for rugged with static analysis
  Cache rubocop cache for CI
  Update gitlab-styles and re-enable the RSpec/SingleLineHook cop again
  Make Gitlab::Git::Repository#run_git private
  Move user page spinach tests to RSpec
  Handle special characters on API request of issuable templates
  Update secret_values to support dynamic elements within parent
  Disable throwOnError in KaTeX to reveal user where is the problem
  Migrate restoring repo from bundle to Gitaly

CE upstream - 2018-01-26 06:22 UTC

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

Fix local RSpec tests due to bug in `webpack_bundle_tag`

Closes #42368

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

CE upstream - 2018-01-25 21:23 UTC

Closes gitaly#946

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

# Conflicts:
#	scripts/lint-rugged

[ci skip]

fix bug in webpack_helper in which force_same_domain argument was ignored breaking local rspec tests

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

Closes gitlab-qa#18

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