Update sync Cron example to be more realistic

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

Properly implement prepending for Concern

Closes gitlab-ce#50824

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

Removes feature flag code for Protected Environments

Closes #7536

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

Add information for keeping security dashboard up-to-date.

Closes #6941

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

Removes two unused methods from the EE::MergeRequestsHelper

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

Refactor maven package repository docs

Closes #7517

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

Pushing to a merge request clears the approvals list if the respective project setting is enabled

Closes #6702

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

Fix sidebar in epics block view on mobile

Closes #7513

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

Previously if the project had approvals_before_merge setting at 0
the approvals would not be cleared even if the "Pushing to a merge
request clears approvals" project setting was enabled.

This commit removes the approvals_before_merge out of the check of
whether we should or not reset the merge request approvals.

Port of 23986-choose-commit-email to EE

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

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

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

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

Protected Environments is available on GitLab.com from 11.3 and
on self-managed instances from 11.4. For that reason, we no longer need
this functionality to be guarded by a feature flag.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/7536

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