# Conflicts:
#	app/models/ci/pipeline.rb
#	app/services/ci/create_pipeline_service.rb
#	app/services/ci/pipeline_trigger_service.rb
#	app/views/admin/application_settings/_form.html.haml
#	spec/features/admin/admin_settings_spec.rb
#	spec/lib/gitlab/ci/pipeline/chain/populate_spec.rb
#	spec/models/ci/pipeline_spec.rb

[ci skip]

CE upstream - 2018-03-26 15:28 UTC

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

Fix LDAP login without user in DB

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

Add test for new README.md in docs

Closes #44647

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

EE fixes for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17796

Prevent unnecessary, excessive updates

Closes #5432

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

Make #base_pipeline returning the latest available pipeline for MR's base commit

Closes #5384

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

Redesign application settings to match project settings (part 1)

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

Pipeline creation service refactoring / EE

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

Improve how we populate pipeline with stages and builds

Closes #43941

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

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

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

[Geo] Fix project rename when wiki does not exist

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

Update omniauth-twitter 1.2.0 -> 1.4

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

* Replace btn-save with btn-success
* Add id to each section so it can be directly linked
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Resolve "Slow SQL running in production queryid 3257994922"

Closes #43552

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

Merge branch 'YarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-to-the-merge-request' into 'master'

Send notification emails when push to a merge request

Closes #23460

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

# Conflicts:
#	doc/README.md

[ci skip]

Bump `state_machines-activerecord` to `0.5.1`

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

[CE] ProtectedBranch API omits empty declared params

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

Docs organize main page by product category

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

Docs organize main page by product category

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

CE upstream - 2018-03-26 09:28 UTC

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

Move the rest EE files from app and lib

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

Array.fill polyfill for IE 11 compatibility.

Closes #44103

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

Merge branch '5409-geo-recovery-from-geo-temporary-directory-doesn-t-work-if-the-namespace-directory-doesn-t-exist' into 'master'

Resolve "Geo: Recovery from @geo-temporary directory doesn't work if the namespace directory doesn't exist"

Closes #5409

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

Prefer index.md instead since they provide clean URLs in the docs site

Disable cursor for review mode in the IDE

Closes #44307

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

Merge branch '43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name' into 'master'

Resolve "Controller parameters handling sensitive information should use a more specific name"

Closes #43316

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

Closes #23460