# Conflicts:
#	app/views/layouts/application.html.haml
#	app/views/layouts/fullscreen.html.haml
#	app/views/layouts/header/_default.html.haml
#	app/views/projects/settings/repository/show.html.haml
#	locale/gitlab.pot

[ci skip]

Merge branch '50974-qa-group-filtering-fails-when-filter-text-field-is-filled-before-the-group-list-is-fully-loaded-leading-to-path-has-already-been-taken-error-qa-tries-to-create-a-bew-subgroup-qa' into 'master'

Resolve "[QA] Group filtering fails when filter text field is filled before the group list is fully loaded leading to "Path has already been taken" error QA tries to create a bew subgroup"

Closes #50974

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

Reduce queries for CI artifacts from MR widget

Closes gitlab-ce#43394

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

Filter web hooks by branch

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

Add missing paths to EE environment serializer

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

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

EE Port (Resolve "UI: Move "default branch" setting under "repository" settings")

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

Resolve "Return how many commits the source branch is behind the target branch through the API"

Closes #36534

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

Ignore irrelevant sql commands in metrics

Closes #51005

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

CE upstream - 2018-09-04 21:21 UTC

Closes gitlab-qa#28

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

Rails 5: fix hashed_path? method that looks up file_location that doesn't exist…

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

Add license info of unknown libraries to license_finder configuration instead of direct approval

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

Sort epics by start date and end date in the roadmap view and epics list view

Closes #6494

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

Ensure the project has a repository in spec/features/merge_request/user_sees_breadcrumb_links_spec.rb

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

Resolve "<link href=""> and <a href=""> not properly filled in activity RSS feed"

Closes #50823

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

Make MySQL patch for binary indexes compatible with composite indexes

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

[EE-port] Port of EE translations to CE

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

Update diff docs regarding where limits are applied

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

Fix tooltip string to support dynamic date type in Epic sidebar

Closes #7450

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

Limit navbar search for current project or group for small viewports

Closes #18488 and #30214

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

Merge branch 'ee-limit-navbar-search-for-current-project-or-group-for-small-viewports' into 'master'

Limit navbar search for current project or group for small viewports

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

Merge branch '7455-update-tests-metadata-is-broken-since-https-gitlab-com-gitlab-org-gitlab-ee-merge_requests-7207' into 'master'

Resolve "update-tests-metadata is broken since https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7207"

Closes #7455

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

Ensure the project has a repository in spec/features/merge_request/user_sees_breadcrumb_links_spec.rb

This backport a fix that was made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7240
since the spec would fail there (and not in CE).
Signed-off-by: Rémy Coutable <remy@rymai.me>

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

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

Resolve "[Rails5] Make GeoMigrationGenerator compatible with Rails 5"

Closes #7074

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

Resolve "UI: Move "default branch" setting under "repository" settings"

Closes #36048

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

New Crowdin translations

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

Resolve "[QA] Orchestrated tests don't run due to wrong tag filters"

Closes #49654 and #50963

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