spec/javascripts/environments/environments_app_spec.js · 1e5f063d32a04d75e66237ee2d1e0fa9df6d052d · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-21 · 1e5f063d
GitLab Bot authored May 21, 2018
```
# Conflicts:
#	spec/javascripts/environments/environments_app_spec.js

[ci skip]
```
1e5f063d