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

Fix flay not detecting identical code

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

Fix N+1 queries with /api/v4/groups endpoint

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

EE: Track and act upon the number of executed SQL queries

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

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

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

Gem is updated from 2.8 to 2.10. [changelog][1]

[1]: https://github.com/seattlerb/flay/blob/master/History.rdoc

Previously the script checked only for 'Similar code', but flay will
tell users when IDENTICAL code is detected too. This should create a
commit will create a failing pipeline, and to check that it does this
commit is pushed.

Fixes #42628

Remove duplicate axios import

Closes #42722

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

This is an EE-only issue since `ldap_group_link` is not in CE.

Fix for gitlab-org/gitlab-ce#42030

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

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

Port of 'webpack-auto-config' to EE

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

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

Closes #4626

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

# 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