# Conflicts:
#	doc/api/jobs.md
#	doc/user/project/quick_actions.md
#	spec/services/quick_actions/interpret_service_spec.rb

[ci skip]

CE upstream - 2018-09-10 10:57 UTC

Closes gitlab-ce#51295

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

Update pseudo file

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

Bump gitlab-shell to 8.3.1

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

docs: Correct YAML indentation

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

8.3.0 was tagged with the commit before the CHANGELOG.md and
version.rb bump, so this just fixes a harmless warning.

Add `duration` attributes to Jobs API docs

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

Add changelog to !21371

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

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

Add /lock and /unlock quick actions

Closes #39173

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

Port of `/lock` and `/unlock` quick actions to EE

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

Replace one word in todos.md

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

Update doc: url reference to grafana

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

Clean up chart index page

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

Clean up chart index page

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

Make topic adhere to style guide

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

Specify tar is required for backup and restore tasks

Closes omnibus-gitlab#2334

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

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

# Conflicts:
#	app/helpers/selects_helper.rb

[ci skip]

Merge branch 'docs/51295-update-documentation-for-interactive-web-terminals-to-remove-beta-indicator' into 'master'

Remove beta from web terminal documentation

Closes #51295

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

Document permissions for different entities

Closes #50036

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

[QA] Fix arguments passed to RSpec::Core::Runner

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

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

Closes gitlab-qa#322

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

closes gitlab-org/gitlab-ce#51295

Enable frozen string for app/helpers/**/*.rb

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

EE Port of gitlab-ce!21320 (Enable frozen string for app/helpers/**/*.rb)

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

Fix LDAP QA specs failing due to button change

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

Update templates and licenses for 11.3

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

CE upstream - 2018-09-10 00:21 UTC

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

Resolve "On master, inline diff view contains extra `+` and `-` signs"

Closes #51281

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

Disable query limit counter in sidekiq

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

[EE] Disable query limit counter in sidekiq

Closes #7087

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

Use the current merge base between CE MR and EE MR

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

API: Use find_branch! in all places

Closes #51250

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