spec/lib/ci/gitlab_ci_yaml_processor_spec.rb · d95c0f5f99b1149eaeb91af2ea7d161428dbc17f · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'origin/master' into gitlab-ci-yaml-updates · 388f69b0
Kamil Trzcinski authored Mar 11, 2016
```
# Conflicts:
#	spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
```
388f69b0