spec/views/projects/jobs/show.html.haml_spec.rb · d839b880a256f208ae5a0d877765bc5fcbfcd44d · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Blame History Permalink

Merge branch 'master' into '42568-pipeline-empty-state' · 2bf83455
Kamil Trzciński authored Apr 06, 2018
```
# Conflicts:
#   app/views/projects/jobs/show.html.haml
#   lib/gitlab/ci/status/core.rb
```
2bf83455

show.html.haml_spec.rb 6.45 KB