# Conflicts:
#	app/models/concerns/protected_branch_access.rb
#	app/models/concerns/protected_tag_access.rb
#	changelogs/unreleased/44596-double-title-merge-request-message.yml
#	doc/user/admin_area/img/admin_area_settings_button.png
#	doc/user/admin_area/settings/continuous_integration.md
#	spec/support/helpers/stub_configuration.rb

[ci skip]

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

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

Add aws_signature_version attribute to packages config in gitlab.yml.example

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

Fix double title in merge request chat messages

Closes #44586

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

EE port: Fix double title in merge request chat messages

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

Merge branch '50944-unable-to-import-repository-undefined-method-import_file-for-nil-nilclass' into 'master'

Resolve "Unable to import repository:  undefined method `import_file' for nil:NilClass"

Closes #50944

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

The class only applies to issues and not to merge requests (which are issuables, too)

Fix setup to set-up in EE-only code (Specs and a model)

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

Fix grammar (setup to set-up) in code comments, spec, views, etc. (Port CE to EE)

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

Fix grammar (setup to set-up) in code comments, spec, views, etc.

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

Add retried jobs to pipeline stages

Closes #50461

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

Resolve "Send deployment information in job API"

Closes #50460

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

Support Kubernetes RBAC for GitLab Managed Apps for creating new clusters

Closes #29398

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

API: Allow issue weight parameter to be greater than or equal to zero

Closes #6822

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

Fixed MR widget unresolved discussions state

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

Disable autocomplete for issuable due date field

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

Document how to enable/disable Auto DevOps at the instance level

Closes #49820

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

Document how to enable Auto DevOps at the instance level

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

Cleaned up CI runner administration code

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

Update command-line-commands.md to include an sample taskflow

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

There has been a mismatch between CE and EE regarding the naming
convention of `issuable_filtered_search_token_keys` and some imports
pointed to the wrong file.

Update sync Cron example to be more realistic

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

Improve docs about CI/CD config `extends`

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

CE: Properly implement prepending for Concern

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

Properly implement prepending for Concern

Closes gitlab-ce#50824

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

This updates the API to accept the same issue weight values that UI app accepts.

Relax Danger requirements about changed lines

Closes gitlab-org/release/framework#13

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

Update GitLab Shell to v8.3.3

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

Cleaned up CI runner administration code

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