# Conflicts:
#	locale/gitlab.pot

[ci skip]

Externalize strings from `/app/views/project/runners`

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

Exclude qa-frontend from running on docs-only branches

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

Instruct against squashing in CE to EE MRs

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

Attempt to fix lazy loader spec transient failure

Closes #49511

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

Fix documentation on using prettier for a specific directory

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

Use Gitaly 1.0.0

Closes gitaly#1406

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

WebIDE: Make Ctrl+Enter automatically commit when commit textarea is focused

Closes #46544

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

Update to properly reference users instead of projects

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

Run `yarn prettier-all-save`

Closes #54462

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

CE upstream - 2018-11-26 05:21 UTC

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

Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23297

# Conflicts:
#	doc/workflow/time_tracking.md

[ci skip]

Add month unit

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

Docs: Add security dashboard missing badge

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

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

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

If the `check` parameter is used, the `allFiles` parameter is `false`,
which causes the prettier.js script only to process staged files.
The correct parameters are `check-all` and `save-all`.

Adds loading state to linked pipeline

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

# Conflicts:
#	doc/README.md

[ci skip]

CE upstream - 2018-11-23 15:21 UTC

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

Speed up setting of relative position

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

Speed up setting of relative position

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

Resolve "Filter by `None`/`Any` for labels in issues/mrs API"

Closes #52371

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

Add docs note for Reverting MR availability

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

add a note about omnibus chart and info how to backup with gitlab chart

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

CE port: Promote the GitLab.com Gold trial on a users default dashboard

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

EE: Promote the GitLab.com Gold trial on a users default dashboard

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

[docs] Enable importing from other sites

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

Fix container_scanning job link

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