# Conflicts:
#	config/webpack.config.js

[ci skip]

CE upstream - 2018-03-23 18:25 UTC

Closes gitaly#1101, #4683, and gitlab-com/infrastructure#19

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

Fix a test that is going to break, that has not broken yet

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

Geo: Mark disabled wiki as fully synced

Closes #5427

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

Resolve "[Geo] Log JID for sync related jobs"

Closes #4994

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

[skip ci]

[Rails5] Update files by `rails app:update`

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

Fix a test that is going to break, that has not broken yet

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

Geo: Remove disabled wikis from out-of-sync queries

Closes #5361

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

Cleanup test for disabling comment submit button

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

Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error' into 'master'

Resolve "Error 500 while attempting to resolve conflicts due to UTF-8 conversion error"

Closes #44564

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

Merge branch 'ee-leipert-42037-long-instance-names-group-names-covers-namespace-dropdown' into 'master'

projects.scss: Fix deviation from CE and move EE only features to EE scss file.

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

Merge branch '44218-add-internationalization-support-for-the-prometheus-merge-request-widget' into 'master'

Resolve "Add internationalization support for the Prometheus Merge Request widget"

Closes #44218

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

When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't
always call `lines`, which meant that we didn't get the benefit of the
side-effect from that, where it forced the conflict data itself to UTF-8.

To fix that, make this explicit by separating the `raw_content` (any encoding)
from the `content` (which is either UTF-8, or an exception is raised).

Resolve "Problem with prettier setting trailingComma: all"

Closes #44589

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

Port of Resolve "Problem with prettier setting trailingComma: all" to EE

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

# Conflicts:
#	app/helpers/application_settings_helper.rb
#	app/models/group.rb
#	db/schema.rb
#	spec/initializers/6_validations_spec.rb
#	spec/lib/gitlab/import_export/safe_model_attributes.yml

[ci skip]

CE upstream - 2018-03-23 06:25 UTC

Closes charts/helm.gitlab.io#291 and gitlab-ce#43937

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

Use geo.log for secondary repository verification logging

Closes #5178

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

Move GitLab.com settings under main docs

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