spec/controllers/projects_controller_spec.rb · 7aefec6223bac1a482f6ea310a94990d084ffb39 · 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-06-20 · 7aefec62
GitLab Bot authored Jun 20, 2018
```
# Conflicts:
#	lib/gitlab/search/parsed_query.rb

[ci skip]
```
7aefec62