# Conflicts:
#	app/controllers/passwords_controller.rb
#	app/finders/users_finder.rb
#	app/models/hooks/service_hook.rb
#	app/models/issue.rb
#	app/models/note.rb
#	app/models/user.rb
#	app/services/applications/create_service.rb
#	app/services/milestones/update_service.rb
#	app/services/search/group_service.rb
#	lib/api/helpers.rb
#	lib/api/resource_label_events.rb
#	lib/gitlab/group_hierarchy.rb

[ci skip]

Fixed resolved discussions not toggling expanded on changes tab

Closes #51370

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

Test that alert's environment is verified

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

Fix column differences in `db/schema.rb`

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

Check that creating an alert for an project non-specific environment
is not possible and return 204.

Add project to jupyter cluster app factory spec

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

CE upstream - 2018-09-13 12:21 UTC

Closes gitlab-ce#49621, gitlab-ce#50186, and charts/auto-deploy-app#6

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

Document abstraction levels and code reuse

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

Remove unused Geo nodes routes

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

This is based on the discussion in
https://gitlab.com/gitlab-org/gitlab-ce/issues/49653 and the example
merge request found at
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20908. The idea
is fairly straightforward: we define a variety of abstractions, then
state which can reuse which. This should ultimately foster _better_ code
reuse, make it easier to debug problems, and make it harder to
accidentally introduce a performance regression.

Add RuboCop cops to enforce code reusing rules

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

EE: Add RuboCop cops to enforce code reusing rules

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

Enable omniauth by default

Closes #49990

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

Display click to expand on collapsed diffs

Closes #51466

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

project_custom_attributes and group_custom_attributes used datetime
instead of datetime_with_timezone column type in database schema. But
actually migration defines `t.timestamps_with_timezone`.

# Conflicts:
#	config/routes.rb
#	spec/lib/gitlab/ci/config_spec.rb

[ci skip]

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

Merge branch '50808-choosing-initialize-repo-with-a-readme-breaks-project-created-from-template' into 'master'

Resolve "Choosing “Initialize repo with a README” breaks project created from template"

Closes #50808

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

Merge branch 'ee-50808-choosing-initialize-repo-with-a-readme-breaks-project-created-from-template' into 'master'

(Port from CE) create project: hide readme checkbox on all tabs except for "blank project" page

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

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

Closes gitlab-ce#50989 and gitaly#1124

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

Vendor Auto-DevOps.gitlab-ci.yml: fix where the deploy job does not wait for Deployment to complete.

Closes #50186 and charts/auto-deploy-app#6

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

Vendor Auto-DevOps.gitlab-ci.yml for refactor to create registry_login() function.

Closes #51450

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