# Conflicts:
#	app/models/clusters/platforms/kubernetes.rb
#	app/services/projects/after_rename_service.rb
#	qa/qa/git/repository.rb

[ci skip]

CE upstream - 2018-10-22 13:22 UTC

Closes gitlab-ce#52690, #7996, gitlab-ce#52559, gitlab-ce#52728, and gitlab-qa#142

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

Revert "Merge branch 'refactor-cluster-create-service-spec' into 'master'"

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

Remove card-title in card-header

Closes #46884

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

This reverts merge request !22407

Improve validation errors for external CI/CD configuration

Closes #51369

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

EE Port for Add Clusters::KubernetesNamespace model - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22404

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

Add Clusters::KubernetesNamespace model

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

Bump mermaid to 8.0.0-rc.8

Closes #52601, #50105, and #40470

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

This reverts commit c3c22cb2.

Change branch font type in tag creation

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

Move Project#rename_repo to a service class

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

EE: Move Project#rename_repo to a service class

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

Make the 'Accepting merge requests' workflow consistent

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

This moves the logic of Project#rename_repo and all methods _only_ used
by this method into a new service class: Projects::AfterRenameService.
By moving this code into a separate service class we can more easily
refactor it, and we also get rid of some RuboCop "disable" statements
automatically.

During the refactoring of this code, I removed most of the explicit
logging using Gitlab::AppLogger. The data that was logged would not be
useful when debugging renaming issues, as it does not add any value on
top of data provided by users.

I also removed a variety of comments that either mentioned something the
code does in literal form, or contained various grammatical errors.
Instead we now resort to more clearly named methods, removing the need
for code comments.

This method was chosen based on analysis in
https://gitlab.com/gitlab-org/release/framework/issues/28. In this issue
we determined this method has seen a total of 293 lines being changed in
it. We also noticed that RuboCop determined the ABC size
(https://www.softwarerenovation.com/ABCMetric.pdf) was too great.

Fix/update prettier script

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

Extract JobContainerItem component

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

Backport rescue in Project#import_url from EE

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

[QA] Move epic-related method to EE class

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

[QA] Port recent changes from EE

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

[QA] Fix verbose? being renamed to debug?

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

docs-Update proofreader.md

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

This model will be used to persist into database Kubernetes properties,
such as namespace, service account name and service account token.

This model will be used to persist into database Kubernetes properties,
such as namespace, service account name and service account token.

Update repository mirroring documentation to reflect current state.

Closes gitlab-ee#4302

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

Port from CE - update repo mirroring documentation

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

EE added a `rescue` to the method Project#import_url, which could cause
merge conflicts when changing this method. This commit backports those
changes to CE, reducing the chances of running into a merge conflict.

Teach Danger how to pick up renamed files

Closes #52783

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

# Conflicts:
#	locale/gitlab.pot

[ci skip]

This moves the logic of Project#rename_repo and all methods _only_ used
by this method into a new service class: Projects::AfterRenameService.
By moving this code into a separate service class we can more easily
refactor it, and we also get rid of some RuboCop "disable" statements
automatically.

During the refactoring of this code, I removed most of the explicit
logging using Gitlab::AppLogger. The data that was logged would not be
useful when debugging renaming issues, as it does not add any value on
top of data provided by users.

I also removed a variety of comments that either mentioned something the
code does in literal form, or contained various grammatical errors.
Instead we now resort to more clearly named methods, removing the need
for code comments.

This method was chosen based on analysis in
https://gitlab.com/gitlab-org/release/framework/issues/28. In this issue
we determined this method has seen a total of 293 lines being changed in
it. We also noticed that RuboCop determined the ABC size
(https://www.softwarerenovation.com/ABCMetric.pdf) was too great.