spec/models/project_wiki_spec.rb · 7bbf09f45ae2356307120e56ee8d63cee564c0d9 · nexedi / gitlab-ce

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-20 · 7bbf09f4

GitLab Bot authored Nov 20, 2018

# Conflicts:
#	CHANGELOG.md
#	locale/gitlab.pot
#	spec/models/merge_request_spec.rb
#	spec/models/project_wiki_spec.rb
#	spec/models/repository_spec.rb
#	spec/services/quick_actions/interpret_service_spec.rb

[ci skip]

7bbf09f4

project_wiki_spec.rb 13.6 KB

Replace project_wiki_spec.rb