CE upstream - 2018-07-11 20:39 UTC

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

Fix #48934 - Focus on text input on danger confirmation

Closes #48934

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

Revert "Merge branch '5481-epic-todos' into 'master'"

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

This reverts commit 79d64720, reversing
changes made to 41c3e005.

# Conflicts:
#	app/models/group.rb
#	ee/app/services/ee/todo_service.rb
#	ee/spec/features/epics/todo_spec.rb

Merge branch '49021-preserve-test-run-artifacts-when-running-gitlab-qa-multiple-times' into 'master'

Resolve "Preserve test run artifacts when running gitlab-qa multiple times"

Closes #49021

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

Truncate filenames created by bin/changelog to 140 characters

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

Fix MR widget border

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

Use Gitaly to set/unset git config, take 2

Closes gitaly#1241

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

Revert "Merge branch 'ee-5481-epic-todos' into 'master'"

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

Move merge requests EE helper methods

Closes #1721

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

CE upstream - 2018-07-11 15:22 UTC

Closes gitlab-qa#231, gitaly#798, gitaly#529, and gitaly#875

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

This reverts commit 4d9a3f42, reversing
changes made to ecf9c145.

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

Fix an exception seen using the online terminal

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

Resolve "Toggle file comments in merge request does not update toggle buttons"

Closes #48237 and #48537

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

# Conflicts:
#	lib/gitlab/access.rb
#	spec/features/boards/sidebar_spec.rb
#	spec/features/issues/form_spec.rb
#	spec/features/projects/merge_requests/user_creates_merge_request_spec.rb
#	spec/javascripts/fixtures/projects.rb
#	spec/requests/api/protected_branches_spec.rb

[ci skip]

Milestone tests

Closes gitlab-qa#231

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

Resolve "Rename the `Master` role to `Maintainer`" Backend

Closes #42751

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

Resolve "Rename the `Master` role to `Maintainer`" Backend

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

Resolve "Add Gitaly Servers to Admin > Overview navigation menu"

Closes #49114

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

CE upstream - 2018-07-11 12:23 UTC

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

Merge branch '45592-nomethoderror-undefined-method-commit-for-nil-nilclass-in-sidekiq-caused-by-a-merge-commit-in-a-forked-project-with-upstream-project-deleted' into 'master'

Resolve "NoMethodError: undefined method `commit' for nil:NilClass in sidekiq caused by a merge commit in a forked project with upstream project deleted."

Closes #45592

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

Bump gitlab-shell to 7.1.5

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

Avoid building potential invalid environment name while seeding

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

Use gitaly 0.112.0

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

Add back MR diff deletion migration

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

Remove last Gitaly flags from Blob and Workhorse

Closes gitaly#798, gitaly#529, and gitaly#875

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