# Conflicts:
#	app/models/group.rb
#	app/models/upload.rb
#	app/services/merge_requests/build_service.rb
#	app/uploaders/attachment_uploader.rb
#	app/uploaders/avatar_uploader.rb
#	app/uploaders/file_uploader.rb
#	app/uploaders/gitlab_uploader.rb
#	app/uploaders/job_artifact_uploader.rb
#	app/uploaders/legacy_artifact_uploader.rb
#	app/uploaders/lfs_object_uploader.rb
#	app/uploaders/namespace_file_uploader.rb
#	app/uploaders/personal_file_uploader.rb
#	config/gitlab.yml.example
#	config/initializers/1_settings.rb
#	spec/controllers/projects/artifacts_controller_spec.rb
#	spec/controllers/projects/raw_controller_spec.rb
#	spec/factories/groups.rb
#	spec/uploaders/attachment_uploader_spec.rb
#	spec/uploaders/avatar_uploader_spec.rb
#	spec/uploaders/file_uploader_spec.rb
#	spec/uploaders/job_artifact_uploader_spec.rb
#	spec/uploaders/legacy_artifact_uploader_spec.rb
#	spec/uploaders/lfs_object_uploader_spec.rb
#	spec/uploaders/namespace_file_uploader_spec.rb
#	spec/uploaders/personal_file_uploader_spec.rb

[ci skip]

More conversions to axios

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

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

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

Improve top area navigation

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

CE upstream - 2018-02-02 12:59 UTC

Closes gitaly#970 and gitlab-ce#41595

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

Resolve "Incorrect merge request title when Jira activated and multiple commits on branch"

Closes #40793

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

Don't show Member Lock setting for unlicensed system

Closes #3225

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

Reload source MRs memoization after diffs creation

Closes #42668

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

Prevent JIRA issue identifier from being humanized

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

- Change button group width on mobile to 100%
- Added scrolling container to activity top area secondary navigation
- Added bottom border to top-area nav-links to separate them from nav-controls

Backport of mr_widget_author.vue EE changes

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

Replace $.ajax in project.js

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

Resolve "Sign-in page logo is not properly rendered."

Closes #42695

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

Add unique constraint to trending_projects#project_id.

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

Resolve "GitLab import leaves `group_id` on ProjectLabel"

Closes #42696

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

EE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16491

Port of gitlab-ee!3867 to CE

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

Move uploads to object storage

Closes #4163

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

# Conflicts:
#	db/schema.rb

[ci skip]

CE upstream - 2018-02-01 18:25 UTC

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

Fix Geo streaming check

Closes #4765

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