# Conflicts:
#	config/webpack.config.js
#	db/schema.rb
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-03-01 21:23 UTC

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

[EE] Support additional LabelsFinder parameters for group labels

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

Fetch commit signatures from Gitaly in batches

Closes gitaly#1046

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

Support additional LabelsFinder parameters for group labels

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

Because epic index page includes also epics from subgroups
it's necessary to also get descendant group labels for filtering.
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4773#note_61236542

Add some strings that were missing in gitlab.pot

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

Allow CI/CD Jobs being grouped on version strings

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

In some situations (listing labels for epics) we want to
list only group ancestor labels, this is already supported
in LabelsFinder we just need to enable additional parameters.

Also `set_issuables_index` method now loads project labels only if
@project is set (which is not used for epic group labels).

Update documentation WRT to request parameters

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

Document how to use external tracking database

Closes #4884

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

Remove protected branches webpack bundle tag (EE)

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

Remove roadmap webpack bundle entry point

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

# Conflicts:
#   config/webpack.config.js

Extend Cluster Applications to install GitLab Runner to Kubernetes cluster

Closes #32831

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

Remove registry list webpack entry point

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

Remove registry list webpack entry point (EE)

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

Improve mount epic to explicitly not mount if element is not found

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

Remove "issues" webpack bundles

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

Remove trailing newline that was causing an EE conflict

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

Remove epic show and new epic webpack bundle tag

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

Add some strings that were missing in gitlab.pot

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