2bf8345542
# Conflicts: # app/views/projects/jobs/show.html.haml # lib/gitlab/ci/status/core.rb |
||
---|---|---|
.. | ||
_build.html.haml_spec.rb | ||
_generic_commit_status.html.haml_spec.rb | ||
show.html.haml_spec.rb |
2bf8345542
# Conflicts: # app/views/projects/jobs/show.html.haml # lib/gitlab/ci/status/core.rb |
||
---|---|---|
.. | ||
_build.html.haml_spec.rb | ||
_generic_commit_status.html.haml_spec.rb | ||
show.html.haml_spec.rb |