# Conflicts:
#	db/schema.rb
#	doc/ci/variables/README.md
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-07-07 03:21 UTC

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

Add note about the k8s namespace of installed applications

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

updates version for CI_JOB_URL and CI_PIPELINE_URL to 11.1

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

Append `skip ci` to Crowdin commit messages

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

This is an undocumented feature of the Crowdin configuration.

This will append `[skip ci]` to all commit messages from Crowdin,
avoiding 100s of pipelines to be created.

The pipeline will need to be run manually for these merge requests
instead.

Resolve "MR refactor: Performance costs of main element with `v-if`"

Closes #48898

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

Merge branch '48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace' into 'master'

Resolve "[Rails5] Invalid single-table inheritance type: Group is not a subclass of Gitlab::BackgroundMigration::FixCrossProjectLabelLinks::Namespace"

Closes #48976

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

Rails5 fix AttachmentRegistryFinder arel queries

Closes #6742, #6745, and #6743

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

Add documentation on private projects

Closes #48955

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

Updates to the `gettext:updated_check`

Closes #48952

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

[EE-Port] Updates to the `gettext:updated_check`

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

adds clarity about how Jira Dev Panel integration works

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

Merge branch '49007-sast-fails-with-syntaxerror-in-scripts-frontend-prettier-js-return-outside-of-function-52-4' into 'master'

Remove return statements from prettier script

Closes #49007

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

adds example of pull mirror curl command

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

Resolve "Installing Helm Tiller Failing"

Closes #48978

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

Fix conflicts for  app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

Make blob and other RPC's mandatory

Closes gitaly#331, gitaly#384, gitaly#446, and gitaly#383

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

Remove gitaly_list_commits_by_oid, gitaly_commit_deltas, gitaly_create_repository flags

Closes gitaly#593, gitaly#566, and gitaly#670

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

Update doc on new option to add README when creating a project

Closes #19468

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

Make all Gitaly diff flags mandatory

Closes gitaly#528 and gitaly#222

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

Make all Gitaly diff flags mandatory (EE version)

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

Updated color of indent guide in Web IDE

Closes #48931

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

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

Resolve "Adding a diff line note freezes the browser"

Closes #48906

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

[11.1.0] Update the dependencies license list

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

[11.1.0] Update .gitignore, .gitlab-ci.yml, and Dockerfile templates

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

This updates only the actual new discussion and not the full tree , which leads to a very costly full rerender

Add options to adjust signed url creation for Object Storage to use older signature if needed.

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