diff options
| author | Kamil Trzciński (OoO till 3th) <ayufan@ayufan.eu> | 2018-07-04 12:17:42 +0300 |
|---|---|---|
| committer | Kamil Trzciński (OoO till 3th) <ayufan@ayufan.eu> | 2018-07-04 12:17:42 +0300 |
| commit | 391710f29d1e82dafb3244691d541573a21acda2 (patch) | |
| tree | 765a5c3ea38387222e81cefbaf1fbe141ef57281 /app/controllers | |
| parent | 5714e57b1338ed2b1893b85d31e6119102de1859 (diff) | |
| parent | 1d3dbe461283a75d91029bd4ab276284cdef1be0 (diff) | |
Merge branch '47040-inconsistent-job-list-in-job-details-view' into 'master'
Resolve "Inconsistent job list in job details view"
Closes #47040
See merge request gitlab-org/gitlab-ce!20243
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/jobs_controller.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/projects/jobs_controller.rb b/app/controllers/projects/jobs_controller.rb index 63f0aea3195..02cac862c3d 100644 --- a/app/controllers/projects/jobs_controller.rb +++ b/app/controllers/projects/jobs_controller.rb @@ -44,12 +44,10 @@ class Projects::JobsController < Projects::ApplicationController end def show - @builds = @project.pipelines - .find_by_sha(@build.sha) - .builds + @pipeline = @build.pipeline + @builds = @pipeline.builds .order('id DESC') .present(current_user: current_user) - @pipeline = @build.pipeline respond_to do |format| format.html |