# Conflicts:
#	doc/api/projects.md
#	lib/api/helpers/projects_helpers.rb

[ci skip]

Resolve "500 Internal Server Error: Deleting branch of deleted project"

Closes #50678

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

Resolve "Placeholder when entering weight value"

Closes #7262

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

Remove Rugged and shell code from Gitlab::Git

Closes gitaly#1124

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

CE upstream - 2018-09-12 05:25 UTC

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

Fix mention in edit mr

Closes #50608

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

Log project services sidekiq failures

Closes #50528

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

Use GitLab UI pagination component for groups

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

Update gitlab shell

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

Update code_review.md to include a recommendation for assigning maintainers from different teams

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

Initialize projects with readme through API

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

Initialize projects with readme

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

Resolve "Markdown footnotes don't render when inside a table..."

Closes #51200

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

Improve recommended maintainer docs

Update example Prometheus queries

Closes #49849

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

Add trigger information for job API

Closes #50989

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

Create new entity called TriggerVariablesEnitity for trigger variables,
to aid reuseablity in the future.

Update JSON schema to include trigger information in the response.

Refactor rspec tests a bit to reduce duplication and for the `context`
to make sense.

closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50989

* Update metric names to match current release.
* Improve descriptions.
* Improve examples to show more query language functionality.

Memory:
* Show use of `or` function.
* Automatically select "MemAvailable" kernel metric if possible.

CPU:
* Show use of `avg without ...`.
* Show CPU utilization per node.

Network:
* Show use of `!=` label matching.
* Don't show "localhost" metrics.

Add GitLab project id to jupyter config installed via cluster apps

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

Add a `initialize_with_readme` parameter to POST /projects.

EE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21617

# Conflicts:
#	app/assets/javascripts/environments/components/environments_table.vue
#	app/assets/javascripts/notes/components/note_actions.vue
#	lib/api/triggers.rb

[ci skip]

Merge branch '51271-error-500-due-to-encoding-issues-when-when-attempting-to-access-issues-api' into 'master'

Resolve "Error 500 due to encoding issues when when attempting to access issues API"

Closes #51271

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

CE upstream - 2018-09-11 18:21 UTC

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

New epic custom notifications docs

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

Docs for integrated milestones

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

- utilize the 'out' method to output the 'fence_info',
  which converts to utf8
- output 'sourcepos' again

Filter any parameters ending with "key" in logs

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

Use gitlab-ui loading icon [EE]

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