summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce Johnson <bryce@gitlab.com>2017-04-14 03:42:59 -0400
committerBryce Johnson <bryce@gitlab.com>2017-04-14 03:42:59 -0400
commit2fb2242fa3fd389a6d9ef070e9057b719a27c603 (patch)
treeec12faa86449f98cdf1d35fea422a9813301097a
parentcfd96fb6a080147e702e2ed91bfc247b78ab7b87 (diff)
downloadgitlab-ce-24339-improve-job-detail-view-to-focus-on-the-bottom-of-the-job-log.tar.gz
-rw-r--r--app/views/projects/builds/_sidebar.html.haml8
-rw-r--r--app/views/projects/builds/show.html.haml4
2 files changed, 11 insertions, 1 deletions
diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml
index 22077a2f80b..54b2f388c5f 100644
--- a/app/views/projects/builds/_sidebar.html.haml
+++ b/app/views/projects/builds/_sidebar.html.haml
@@ -1,3 +1,10 @@
+%job-details-sidebar{ 'inline-template' => true }
+ %job-details-stuff-you-can-do
+ %jobs-dropdown-selector-thing-just-regular-markup-not-acomponent
+
+- build.id, coverage, artifacts, artifacts_expire_at,
+- artifacts_expired, has_expiring_artifacts,
+- user can read_build, user can update build
- builds = @build.pipeline.builds.to_a
%aside.right-sidebar.right-sidebar-expanded.build-sidebar.js-build-sidebar.js-right-sidebar{ data: { "offset-top" => "153", "spy" => "affix" } }
@@ -103,6 +110,7 @@
%p.build-light-text.append-bottom-0
#{@build.pipeline.git_commit_title}
+ // Don't touch anything from here down
- if @build.tags.any?
.block
.title
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 5a45a97da9d..016704cc781 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -17,7 +17,6 @@
'user-can-retry-job' => can?(current_user, :update_build, @build).to_s,
'retry-job-url' => retry_namespace_project_build_path(@project.namespace, @project, @build),
'new-issue-url' => new_namespace_project_issue_path(@project.namespace, @project, issue: build_failed_issue_options) }}
- %job-details-sidebar
.build-page
= render "header"
- if @build.stuck?
@@ -96,5 +95,8 @@
#down-build-trace
= render "sidebar"
+ %job-details-sidebar{ 'inline-template' => true }
+ %job-details-stuff-you-can-do
+ %jobs-dropdown-selector-thing-not-markup
.js-build-options{ data: javascript_build_options }