spec/models/merge_request_spec.rb · b9f35f4e04c0d65b84c58033c31a7c673d04c4ca · nexedi / gitlab-ce · GitLab

You need to sign in or sign up before continuing.

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-03 · 9814b13e
GitLab Bot authored Oct 03, 2018
```
# Conflicts:
#	Gemfile.lock
#	Gemfile.rails5.lock
#	scripts/lint-rugged
#	spec/models/namespace_spec.rb

[ci skip]
```
9814b13e

merge_request_spec.rb 99.4 KB