spec/controllers/projects_controller_spec.rb · 224b51fccc651730065e3299de8598683d754dac · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-26 · de52f5b1
GitLab Bot authored Jun 26, 2018
```
# Conflicts:
#	app/views/shared/boards/_show.html.haml
#	app/views/shared/boards/components/_board.html.haml

[ci skip]
```
de52f5b1

projects_controller_spec.rb 26.3 KB