# Conflicts:
#	app/assets/javascripts/boards/filtered_search_boards.js
#	app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
#	app/assets/javascripts/pages/projects/issues/show.js
#	app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
#	app/assets/javascripts/pages/search/init_filtered_search.js
#	app/finders/merge_requests_finder.rb
#	config/sidekiq_queues.yml

[ci skip]

Removing the two factor check when the user sets a new password

Closes #28141

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

Make project#namespace_id not null

Closes #26052

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

Resolve "Allow API method /projects/:id/repository/commits  to work over all commits"

Closes #42434

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

CE upstream - 2018-03-01 00:35 UTC

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

Pipeline variables expressions

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

Resolve "Tooltip for the stop pipeline button is 'Cancel'"

Closes #42946

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

Encode revision for gitattributes ref

Closes gitaly#1032 and #43278

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix test failure by using manual currentDate values

Closes #5088

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

This reverts commit 7ed005a5.
Signed-off-by: Rémy Coutable <remy@rymai.me>

Bump source installs to use git 2.16

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

Mark empty repos as synced in Geo

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Document the ee-files-location-check CI job

Closes #43711

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

Resolve "Projects hooks : confidential_issues_events"

Closes #43425

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

Port of dz-system-hooks-plugins to EE

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

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

Detect more CE branch patterns in scripts/ee-files-location-check

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

Add animation performance guide to frontend docs

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

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

Add source and target branch filters to merge requests API

Closes #42492

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

Add source and target branch filters to merge requests API

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

Resolve "Externalization (i18n) documentation should say that whole shouldn't be split into several externalized words/group of words"

Closes #43294

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>