diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-06 12:17:22 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-06 12:17:22 +0000 |
commit | 35bf473f2a6920a2de1b434ad264fc30a73e6177 (patch) | |
tree | 4945fe2e23492eef6906c478fb55703acaf7ee54 /qa | |
parent | 38f95d6c81265521869edd6c46e1c7209ff27b5b (diff) | |
parent | 7644edd8aae6d2959790f35302d3f0ec5767097d (diff) | |
download | gitlab-ce-35bf473f2a6920a2de1b434ad264fc30a73e6177.tar.gz |
Merge branch 'jivl-backport-scroll-utilities' into 'master'
Backport scroll utilities for the job log component
See merge request gitlab-org/gitlab-ce!19221
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/page/project/job/show.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/qa/page/project/job/show.rb b/qa/qa/page/project/job/show.rb index 83bb224b5c3..f1a859fd8ee 100644 --- a/qa/qa/page/project/job/show.rb +++ b/qa/qa/page/project/job/show.rb @@ -4,7 +4,7 @@ module QA::Page COMPLETED_STATUSES = %w[passed failed canceled blocked skipped manual].freeze # excludes created, pending, running PASSED_STATUS = 'passed'.freeze - view 'app/views/projects/jobs/show.html.haml' do + view 'app/views/shared/builds/_build_output.html.haml' do element :build_output, '.js-build-output' end |