# Conflicts:
#	app/views/projects/project_members/index.html.haml
#	config/routes/api.rb
#	doc/api/namespaces.md
#	doc/api/protected_branches.md
#	doc/ci/variables/README.md
#	doc/system_hooks/system_hooks.md
#	doc/user/project/protected_branches.md
#	lib/api/protected_branches.rb
#	locale/gitlab.pot

[ci skip]

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

Closes #42751

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

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

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

Move GC/Repack to OptOut

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

Validate classification label on create & update

Closes #5336

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

[CE-Backport] Skip creating project when errors were added

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

CE upstream - 2018-06-05 21:46 UTC

Closes gitaly#1221

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

Also match against tags because we could want to match tags

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

Otherwise the ApplicationSetting that is currently stored would be
invalid as it specifies a storage that is not configured

Otherwise the ApplicationSetting that is currently stored would be
invalid as it specifies a storage that is not configured

This could be done when a block is passed in EE.

This makes sure that the current user is allowed to access the project
once the classification label has changed.

Live trace: Rescue stale live trace

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

Merge branch 'blackst0ne-rails5-wrong-number-of-arguments-given-1-expected-0-in-20170324160416_migrate_user_activities_to_users_last_activity_on-rb' into 'master'

Resolve "[Rails5] wrong number of arguments (given 1, expected 0) in 20170324160416_migrate_user_activities_to_users_last_activity_on.rb"

Closes #47374

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

Adds Kubernetes Pod Logs to GitLab

Closes #4752

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