Kamil Trzciński 2bf8345542 Merge branch 'master' into '42568-pipeline-empty-state' ... # Conflicts: # app/views/projects/jobs/show.html.haml # lib/gitlab/ci/status/core.rb		2018-04-06 09:16:40 +00:00
..
_build.html.haml_spec.rb	Rename BuildsController to JobsController	2017-05-17 20:17:30 +08:00
_generic_commit_status.html.haml_spec.rb	Rename BuildsController to JobsController	2017-05-17 20:17:30 +08:00
show.html.haml_spec.rb	Merge branch 'master' into '42568-pipeline-empty-state'	2018-04-06 09:16:40 +00:00