diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-03-19 10:07:30 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-03-19 10:07:30 +0000 |
| commit | 18bce8fcfeaaeeda5aea37f21adedcdc49dd4147 (patch) | |
| tree | 1abd83e0486a72643c1a79e1f0287da452c22558 | |
| parent | 2a5f9709614a33143cb0f47a2602cf161ba4b2cd (diff) | |
| download | gitlab-ce-18bce8fcfeaaeeda5aea37f21adedcdc49dd4147.tar.gz | |
Update partial name and remove changes to database fixtures
| -rw-r--r-- | app/views/projects/jobs/_empty_states.html.haml (renamed from app/views/projects/jobs/_empty_status.html.haml) | 0 | ||||
| -rw-r--r-- | app/views/projects/jobs/show.html.haml | 2 | ||||
| -rw-r--r-- | db/fixtures/development/14_pipelines.rb | 4 |
3 files changed, 1 insertions, 5 deletions
diff --git a/app/views/projects/jobs/_empty_status.html.haml b/app/views/projects/jobs/_empty_states.html.haml index 9e144dbfe32..9e144dbfe32 100644 --- a/app/views/projects/jobs/_empty_status.html.haml +++ b/app/views/projects/jobs/_empty_states.html.haml diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml index 04c28841511..1db01133900 100644 --- a/app/views/projects/jobs/show.html.haml +++ b/app/views/projects/jobs/show.html.haml @@ -90,7 +90,7 @@ %code.bash.js-build-output .build-loader-animation.js-build-refresh - else - = render "empty_status" + = render "empty_states" = render "sidebar" diff --git a/db/fixtures/development/14_pipelines.rb b/db/fixtures/development/14_pipelines.rb index fe21b7aad0e..d3a63aa2a78 100644 --- a/db/fixtures/development/14_pipelines.rb +++ b/db/fixtures/development/14_pipelines.rb @@ -30,10 +30,6 @@ class Gitlab::Seeder::Pipelines queued_at: 8.hour.ago, started_at: 8.hour.ago, finished_at: 7.hour.ago }, { name: 'spinach:osx', stage: 'test', status: :failed, allow_failure: true, queued_at: 8.hour.ago, started_at: 8.hour.ago, finished_at: 7.hour.ago }, - { name: 'spinach:osx1', stage: 'test', status: :canceled, - queued_at: 8.hour.ago, started_at: 8.hour.ago, finished_at: 7.hour.ago }, - { name: 'spinach:osx1', stage: 'test', status: :running, - queued_at: 8.hour.ago, started_at: 8.hour.ago, finished_at: 7.hour.ago }, # deploy stage { name: 'staging', stage: 'deploy', environment: 'staging', status_event: :success, |