app/models/identity/uniqueness_scopes.rb · 784ab270b0567ce94c698be22130bc9c79cba76c · nexedi / gitlab-ce

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-13 · 784ab270

GitLab Bot authored Nov 13, 2018

# Conflicts:
#	app/models/identity/uniqueness_scopes.rb
#	doc/ci/examples/browser_performance.md
#	doc/ci/examples/code_quality.md
#	doc/ci/examples/container_scanning.md
#	doc/ci/examples/dast.md
#	doc/ci/yaml/README.md

[ci skip]

784ab270

uniqueness_scopes.rb 411 Bytes

Replace uniqueness_scopes.rb