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

# Conflicts:
#	app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
#	app/assets/javascripts/filtered_search/filtered_search_manager.js
#	app/assets/javascripts/pages/groups/issues/index.js
#	app/assets/javascripts/pages/groups/merge_requests/index.js
#	app/assets/javascripts/pages/projects/issues/index/index.js
#	app/assets/javascripts/pages/projects/merge_requests/index/index.js
#	app/controllers/admin/runners_controller.rb
#	app/helpers/sorting_helper.rb
#	app/models/ci/runner.rb
#	app/views/admin/runners/index.html.haml
#	lib/api/runners.rb
#	locale/gitlab.pot
#	spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js
#	spec/javascripts/filtered_search/dropdown_user_spec.js
#	spec/javascripts/filtered_search/dropdown_utils_spec.js
#	spec/javascripts/filtered_search/filtered_search_manager_spec.js
#	spec/javascripts/filtered_search/filtered_search_tokenizer_spec.js

[ci skip]

Revert "Merge branch 'dz-add-project-id-to-jupyter' into 'master'"

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

Feature: State filter for admin runners view

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

Feature: State filter for admin runners view (EE-port)

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

Filter group milestones based on user membership.

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

Create specs for diffs/components/app and update modules to export factory functions

Closes #49329

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

Remove unused packages config from 1_settings.rb

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

CE upstream - 2018-09-14 05:22 UTC

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

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

Closes gitlab-ce#51370

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

Enable frozen string in app/graphql + app/finders

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

Update Gitlay server version to 0.121.0

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

Resolve "ee:geo QA specs are failing as of !7210"

Closes gitlab-org/quality/nightly#7 and #7434

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

# 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

As a side benefit, we don’t need to resolve the race condition in which
the secondary node does not yet have a GeoNodeStatus when the specs make
requests for it.

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

This reverts merge request !21341

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