CE upstream - 2018-08-26 18:21 UTC

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

Removes disabled rule from settings_panel EE to match the CE version

Closes #7346

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

Bitbucket Server importer: Eliminate most idle-in-transaction issues

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

CE upstream - 2018-08-26 15:21 UTC

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

Use slugs for default project path and sanitize names before import

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

Rails5 fix project import spec

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

Just like with the GitHub importer, the Bitbucket Server importer can hit the
default 60 s idle-in-transaction timeouts if it takes too long to create the
merge request. We solve this by using the same approach as the GitHub importer:

1. Bypass all validation and hooks in creating a merge request
2. Insert the Git data in a separate transaction

Part of #50021

CE upstream - 2018-08-26 09:21 UTC

Closes #6028

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

# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

[ci skip]

Show `< 1%` when percent value evaluated is less than 1 on Stacked Progress Bar

Closes gitlab-ee#6028

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

[QA] Re-add Test::Instance for back-compatibility with GitLab < 11.3

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

Add Test plan issue template

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

EE Port (Resolve "Follow up to "Styling of the MR widget's info and pipeline sections"")

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

Resolve "Follow up to "Styling of the MR widget's info and pipeline sections""

Closes #49110

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

CE upstream - 2018-08-25 06:21 UTC

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

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

# Conflicts:
#	lib/api/api.rb

[ci skip]

API: Protected tags

Closes #39144

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

Feature flag to disable Hashed Storage migration when renaming a repository

Closes #50345

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

CE upstream - 2018-08-24 21:21 UTC

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

Drop WIP from changelog command in Danger comment

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

Refactor project_permissions_panel_data so it can be extended in EE easily

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

CE upstream - 2018-08-24 18:21 UTC

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

Refactor GitHub Importer database helpers into helper methods

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

Users importing from Bitbucket Cloud, Bitbucket Server, or GitHub
often complained about getting failed imports due to 422 errors.
This change ensures that project names are imported with names that
are guaranteed to pass the regular expression validation.

Part of #50021

Removing not necessarily indentations in update Ruby code block

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

[docs] Update CONTRIBUTING.md

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

POST should be PUT in the API labels specs

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

CE upstream - 2018-08-24 15:22 UTC

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

# Conflicts:
#	app/assets/stylesheets/framework/variables.scss
#	app/assets/stylesheets/pages/environments.scss

[ci skip]