# Conflicts:
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/main.js
#	app/assets/stylesheets/framework.scss
#	app/controllers/application_controller.rb
#	app/helpers/projects_helper.rb
#	app/models/note.rb
#	app/models/protected_branch.rb
#	app/services/ci/register_job_service.rb
#	app/services/users/build_service.rb
#	app/views/admin/health_check/show.html.haml
#	app/views/ci/variables/_variable_row.html.haml
#	app/views/help/index.html.haml
#	app/views/layouts/devise.html.haml
#	app/views/layouts/nav/sidebar/_profile.html.haml
#	lib/api/helpers/runner.rb
#	lib/gitlab/auth.rb
#	spec/lib/gitlab/current_settings_spec.rb
#	spec/lib/gitlab/usage_data_spec.rb

[ci skip]

CE upstream - 2018-02-02 18:24 UTC

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

Update CONTRIBUTING.md with a link to the Contributing page on about.gitlab.com

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

Change rounding on code coverage badge to be consistent with other displays

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

Resolve "Specifying asset host produces broken URL"

Closes #42023

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

Signed-off-by: Bastian Blank <waldi@debian.org>

Client changes for Tag,BranchNamesContainingCommit

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

Resolve "After applying new file template commit change button doesn't enable"

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

Remove duplicate axios import

Closes #42722

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

Add changelog

Follow event trigger convention

Remove repo reloading logic from Repository#find_branch

Closes #42609

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

issues.closed_at should be datetime_with_timezone

Closes gitlab-qa#176

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

CE has this type right, but somehow EE lost this change.

Closes gitlab-org/gitlab-qa#176

Fix JobArtifactUploader namespacing issues

Closes #4801

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

Update labels migration timestamp to run earlier than the one that removes namespaces to avoid issues

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

Fix spelling of “discrepancy” in GitHub→GitLab project import docs

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

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/4801

Refactor CI variable list code for usage with CI/CD settings page secret variables -- EE merge edition

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

Refactor CI variable list code for usage with CI/CD settings page secret variables

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

Resolve "Rubocop regular expression check is breaking master"

Closes #42729

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

Gitlab::Git::Repository#find_branch has a similar logic.

Fixes #42609

Remove duplicate axios import

Closes #42722

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

Add Colors to GitLab Flavored Markdown

Closes #24167

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

Port of 'webpack-auto-config' to EE

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

Automatically Generate Webpack Entry Points

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

Sanitize extra blank spaces used when uploading a SSH key

Closes #40552

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

Avoid error when creating forks and restricted levels are defined

Closes #42607

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

[Geo] Skip attachments that is stored in the object storage

Closes #4626

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

use Gitlab::UserSettings directly as a singleton instead of including/extending it

Closes #37698

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