app/controllers/projects/variables_controller.rb · 98b294e01971c141e1167caa3da013cee903b21f · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-26 · b6b09a14
GitLab Bot authored Mar 26, 2018
```
# Conflicts:
#	doc/README.md

[ci skip]
```
b6b09a14