Start builds redesign
This commit is contained in:
parent
950ab1e847
commit
7878eb9fa6
55 changed files with 118 additions and 85 deletions
|
@ -18,7 +18,7 @@
|
||||||
line-height: 36px;
|
line-height: 36px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.gray-content-block {
|
.row-content-block {
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
margin-bottom: -$gl-padding;
|
margin-bottom: -$gl-padding;
|
||||||
background-color: $background-color;
|
background-color: $background-color;
|
||||||
|
@ -81,6 +81,11 @@
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.build-content {
|
||||||
|
background-color: $white-light;
|
||||||
|
border-top: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.cover-block {
|
.cover-block {
|
||||||
|
@ -113,7 +118,7 @@
|
||||||
line-height: 1.1;
|
line-height: 1.1;
|
||||||
|
|
||||||
h1 {
|
h1 {
|
||||||
color: #313236;
|
color: $gl-gray-dark;
|
||||||
margin-bottom: 6px;
|
margin-bottom: 6px;
|
||||||
font-size: 23px;
|
font-size: 23px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,7 +59,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@mixin btn-gray {
|
@mixin btn-gray {
|
||||||
@include btn-color($gray-light, $border-gray-light, $gray-normal, $border-gray-light, $gray-dark, $border-gray-dark, #313236);
|
@include btn-color($gray-light, $border-gray-light, $gray-normal, $border-gray-light, $gray-dark, $border-gray-dark, $gl-gray-dark);
|
||||||
}
|
}
|
||||||
|
|
||||||
@mixin btn-white {
|
@mixin btn-white {
|
||||||
|
|
|
@ -81,7 +81,7 @@
|
||||||
|
|
||||||
// Labels
|
// Labels
|
||||||
.label {
|
.label {
|
||||||
padding: 2px 4px;
|
padding: 4px 5px;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
|
|
|
@ -42,14 +42,14 @@
|
||||||
margin: 24px 0 12px;
|
margin: 24px 0 12px;
|
||||||
padding: 0 0 10px;
|
padding: 0 0 10px;
|
||||||
border-bottom: 1px solid #e7e9ed;
|
border-bottom: 1px solid #e7e9ed;
|
||||||
color: #313236;
|
color: $gl-gray-dark;
|
||||||
}
|
}
|
||||||
|
|
||||||
h2 {
|
h2 {
|
||||||
font-size: 1.2em;
|
font-size: 1.2em;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
margin: 24px 0 12px;
|
margin: 24px 0 12px;
|
||||||
color: #313236;
|
color: $gl-gray-dark;
|
||||||
}
|
}
|
||||||
|
|
||||||
h3 {
|
h3 {
|
||||||
|
|
|
@ -20,7 +20,7 @@ $background-color: #fafafa;
|
||||||
*/
|
*/
|
||||||
$gl-font-size: 15px;
|
$gl-font-size: 15px;
|
||||||
$gl-title-color: #333;
|
$gl-title-color: #333;
|
||||||
$gl-text-color: #555;
|
$gl-text-color: #5c5c5c;
|
||||||
$gl-text-green: #4a2;
|
$gl-text-green: #4a2;
|
||||||
$gl-text-red: #d12f19;
|
$gl-text-red: #d12f19;
|
||||||
$gl-text-orange: #d90;
|
$gl-text-orange: #d90;
|
||||||
|
@ -30,6 +30,7 @@ $gl-placeholder-color: #8f8f8f;
|
||||||
$gl-icon-color: $gl-placeholder-color;
|
$gl-icon-color: $gl-placeholder-color;
|
||||||
$gl-grayish-blue: #7f8fa4;
|
$gl-grayish-blue: #7f8fa4;
|
||||||
$gl-gray: $gl-text-color;
|
$gl-gray: $gl-text-color;
|
||||||
|
$gl-gray-dark: #313236;
|
||||||
$gl-header-color: $gl-title-color;
|
$gl-header-color: $gl-title-color;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -31,9 +31,17 @@
|
||||||
}
|
}
|
||||||
.commit-committer-link,
|
.commit-committer-link,
|
||||||
.commit-author-link {
|
.commit-author-link {
|
||||||
color: #444;
|
color: $gl-gray;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ci-status {
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fa-clipboard {
|
||||||
|
color: $dropdown-title-btn-color;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.commit-box {
|
.commit-box {
|
||||||
|
@ -42,7 +50,7 @@
|
||||||
.commit-title {
|
.commit-title {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
font-size: 23px;
|
font-size: 23px;
|
||||||
color: #313236;
|
color: $gl-gray-dark;
|
||||||
}
|
}
|
||||||
|
|
||||||
.commit-description {
|
.commit-description {
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
.title {
|
.title {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
font-size: 23px;
|
font-size: 23px;
|
||||||
color: #313236;
|
color: $gl-gray-dark;
|
||||||
}
|
}
|
||||||
|
|
||||||
.description {
|
.description {
|
||||||
|
|
|
@ -104,7 +104,7 @@
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
font-size: 17px;
|
font-size: 17px;
|
||||||
margin: 5px 0;
|
margin: 5px 0;
|
||||||
color: #313236;
|
color: $gl-gray-dark;
|
||||||
}
|
}
|
||||||
|
|
||||||
p:last-child {
|
p:last-child {
|
||||||
|
@ -136,7 +136,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.label-branch {
|
.label-branch {
|
||||||
color: #313236;
|
color: $gl-gray-dark;
|
||||||
font-family: $monospace_font;
|
font-family: $monospace_font;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
@ -272,3 +272,19 @@
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: 250px;
|
width: 250px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.table-holder {
|
||||||
|
.builds {
|
||||||
|
|
||||||
|
th {
|
||||||
|
background-color: $white-light;
|
||||||
|
color: $gl-placeholder-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
th,
|
||||||
|
td {
|
||||||
|
padding: 16px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -178,7 +178,7 @@
|
||||||
.option-title {
|
.option-title {
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
color: #313236;
|
color: $gl-gray-dark;
|
||||||
}
|
}
|
||||||
|
|
||||||
.option-descr {
|
.option-descr {
|
||||||
|
|
|
@ -35,15 +35,15 @@
|
||||||
%td
|
%td
|
||||||
#{build.stage} / #{build.name}
|
#{build.stage} / #{build.name}
|
||||||
|
|
||||||
.pull-right
|
%td
|
||||||
- if build.tags.any?
|
- if build.tags.any?
|
||||||
- build.tags.each do |tag|
|
- build.tags.each do |tag|
|
||||||
%span.label.label-primary
|
%span.label.label-primary
|
||||||
= tag
|
= tag
|
||||||
- if build.try(:trigger_request)
|
- if build.try(:trigger_request)
|
||||||
%span.label.label-info triggered
|
%span.label.label-info triggered
|
||||||
- if build.try(:allow_failure)
|
- if build.try(:allow_failure)
|
||||||
%span.label.label-danger allowed to fail
|
%span.label.label-danger allowed to fail
|
||||||
|
|
||||||
%td.duration
|
%td.duration
|
||||||
- if build.duration
|
- if build.duration
|
||||||
|
@ -69,4 +69,4 @@
|
||||||
%i.fa.fa-remove.cred
|
%i.fa.fa-remove.cred
|
||||||
- elsif defined?(allow_retry) && allow_retry && build.retryable?
|
- elsif defined?(allow_retry) && allow_retry && build.retryable?
|
||||||
= link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry' do
|
= link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry' do
|
||||||
%i.fa.fa-repeat
|
%i.fa.fa-refresh
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
- if @all_builds.running_or_pending.any?
|
- if @all_builds.running_or_pending.any?
|
||||||
= link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
|
= link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
|
||||||
|
|
||||||
.gray-content-block.second-block
|
.row-content-block.second-block
|
||||||
#{(@scope || 'running').capitalize} builds
|
#{(@scope || 'running').capitalize} builds
|
||||||
|
|
||||||
%ul.content-list
|
%ul.content-list
|
||||||
|
@ -38,6 +38,7 @@
|
||||||
%th Ref
|
%th Ref
|
||||||
%th Runner
|
%th Runner
|
||||||
%th Name
|
%th Name
|
||||||
|
%th Tags
|
||||||
%th Duration
|
%th Duration
|
||||||
%th Finished at
|
%th Finished at
|
||||||
%th
|
%th
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
%li{ class: (klass == Gitlab::GitLogger ? 'active' : '') }
|
%li{ class: (klass == Gitlab::GitLogger ? 'active' : '') }
|
||||||
= link_to klass::file_name, "##{klass::file_name_noext}",
|
= link_to klass::file_name, "##{klass::file_name_noext}",
|
||||||
'data-toggle' => 'tab'
|
'data-toggle' => 'tab'
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
To prevent performance issues admin logs output the last 2000 lines
|
To prevent performance issues admin logs output the last 2000 lines
|
||||||
.tab-content
|
.tab-content
|
||||||
- loggers.each do |klass|
|
- loggers.each do |klass|
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
Without projects
|
Without projects
|
||||||
%small.badge= number_with_delimiter(User.without_projects.count)
|
%small.badge= number_with_delimiter(User.without_projects.count)
|
||||||
|
|
||||||
.gray-content-block.second-block
|
.row-content-block.second-block
|
||||||
.pull-right
|
.pull-right
|
||||||
.dropdown.inline
|
.dropdown.inline
|
||||||
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
= icon('spinner spin')
|
= icon('spinner spin')
|
||||||
|
|
||||||
.todos-filters
|
.todos-filters
|
||||||
.gray-content-block.second-block
|
.row-content-block.second-block
|
||||||
= form_tag todos_filter_path(without: [:project_id, :author_id, :type, :action_id]), method: :get, class: 'filter-form' do
|
= form_tag todos_filter_path(without: [:project_id, :author_id, :type, :action_id]), method: :get, class: 'filter-form' do
|
||||||
.filter-item.inline
|
.filter-item.inline
|
||||||
= select_tag('project_id', todo_projects_options,
|
= select_tag('project_id', todo_projects_options,
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
- if show_last_push_widget?(event)
|
- if show_last_push_widget?(event)
|
||||||
.gray-content-block.clear-block.last-push-widget
|
.row-content-block.clear-block.last-push-widget
|
||||||
.event-last-push
|
.event-last-push
|
||||||
.event-last-push-text
|
.event-last-push-text
|
||||||
%span You pushed to
|
%span You pushed to
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
- else
|
- else
|
||||||
= render 'explore/head'
|
= render 'explore/head'
|
||||||
|
|
||||||
.gray-content-block.clearfix
|
.row-content-block.clearfix
|
||||||
.pull-left
|
.pull-left
|
||||||
= form_tag explore_groups_path, method: :get, class: 'form-inline form-tiny' do |f|
|
= form_tag explore_groups_path, method: :get, class: 'form-inline form-tiny' do |f|
|
||||||
= hidden_field_tag :sort, @sort
|
= hidden_field_tag :sort, @sort
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
- else
|
- else
|
||||||
= render 'explore/head'
|
= render 'explore/head'
|
||||||
|
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
- if current_user
|
- if current_user
|
||||||
.pull-right
|
.pull-right
|
||||||
= link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
|
= link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
= render 'shared/issuable/filter', type: :issues
|
= render 'shared/issuable/filter', type: :issues
|
||||||
|
|
||||||
.gray-content-block.second-block
|
.row-content-block.second-block
|
||||||
Only issues from
|
Only issues from
|
||||||
%strong #{@group.name}
|
%strong #{@group.name}
|
||||||
group are listed here.
|
group are listed here.
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
= render 'shared/issuable/filter', type: :merge_requests
|
= render 'shared/issuable/filter', type: :merge_requests
|
||||||
|
|
||||||
.gray-content-block.second-block
|
.row-content-block.second-block
|
||||||
Only merge requests from
|
Only merge requests from
|
||||||
%strong #{@group.name}
|
%strong #{@group.name}
|
||||||
group are listed here.
|
group are listed here.
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
= icon('plus')
|
= icon('plus')
|
||||||
New Milestone
|
New Milestone
|
||||||
|
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
Only milestones from
|
Only milestones from
|
||||||
%strong #{@group.name}
|
%strong #{@group.name}
|
||||||
group are listed here.
|
group are listed here.
|
||||||
|
|
|
@ -48,14 +48,14 @@
|
||||||
|
|
||||||
.lead
|
.lead
|
||||||
Gray content block with side padding using
|
Gray content block with side padding using
|
||||||
%code .gray-content-block
|
%code .row-content-block
|
||||||
|
|
||||||
.example
|
.example
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
%h4 Normal block inside content
|
%h4 Normal block inside content
|
||||||
= lorem
|
= lorem
|
||||||
|
|
||||||
.gray-content-block.second-block
|
.row-content-block.second-block
|
||||||
%h4 Second block
|
%h4 Second block
|
||||||
= lorem
|
= lorem
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
- if event = last_push_event
|
- if event = last_push_event
|
||||||
- if show_last_push_widget?(event)
|
- if show_last_push_widget?(event)
|
||||||
|
|
||||||
.gray-content-block.top-block.clear-block.hidden-xs
|
.row-content-block.top-block.clear-block.hidden-xs
|
||||||
.event-last-push
|
.event-last-push
|
||||||
.event-last-push-text
|
.event-last-push-text
|
||||||
%span You pushed to
|
%span You pushed to
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
= cache(readme_cache_key) do
|
= cache(readme_cache_key) do
|
||||||
= render_readme(readme)
|
= render_readme(readme)
|
||||||
- else
|
- else
|
||||||
.gray-content-block.second-block.center
|
.row-content-block.second-block.center
|
||||||
%h3.page-title
|
%h3.page-title
|
||||||
This project does not have a README yet
|
This project does not have a README yet
|
||||||
- if can?(current_user, :push_code, @project)
|
- if can?(current_user, :push_code, @project)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
- page_title 'Artifacts', "#{@build.name} (##{@build.id})", 'Builds'
|
- page_title 'Artifacts', "#{@build.name} (##{@build.id})", 'Builds'
|
||||||
= render 'projects/builds/header_title'
|
= render 'projects/builds/header_title'
|
||||||
|
|
||||||
.top-block.gray-content-block.clearfix
|
.top-block.row-content-block.clearfix
|
||||||
.pull-right
|
.pull-right
|
||||||
= link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, @build),
|
= link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, @build),
|
||||||
class: 'btn btn-default download' do
|
class: 'btn btn-default download' do
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
- page_title "Branches"
|
- page_title "Branches"
|
||||||
= render "projects/commits/header_title"
|
= render "projects/commits/header_title"
|
||||||
= render "projects/commits/head"
|
= render "projects/commits/head"
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
.pull-right
|
.pull-right
|
||||||
- if can? current_user, :push_code, @project
|
- if can? current_user, :push_code, @project
|
||||||
= link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
|
= link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
= icon('wrench')
|
= icon('wrench')
|
||||||
%span CI Lint
|
%span CI Lint
|
||||||
|
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
#{(@scope || 'running').capitalize} builds from this project
|
#{(@scope || 'running').capitalize} builds from this project
|
||||||
|
|
||||||
%ul.content-list
|
%ul.content-list
|
||||||
|
@ -52,6 +52,7 @@
|
||||||
%th Ref
|
%th Ref
|
||||||
%th Stage
|
%th Stage
|
||||||
%th Name
|
%th Name
|
||||||
|
%th Tags
|
||||||
%th Duration
|
%th Duration
|
||||||
%th Finished at
|
%th Finished at
|
||||||
- if @project.build_coverage_enabled?
|
- if @project.build_coverage_enabled?
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
= render "header_title"
|
= render "header_title"
|
||||||
|
|
||||||
.build-page
|
.build-page
|
||||||
.gray-content-block.top-block
|
.row-content-block.top-block
|
||||||
Build ##{@build.id} for commit
|
Build ##{@build.id} for commit
|
||||||
%strong.monospace= link_to @build.commit.short_sha, ci_status_path(@build.commit)
|
%strong.monospace= link_to @build.commit.short_sha, ci_status_path(@build.commit)
|
||||||
from
|
from
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
%i.fa.fa-warning
|
%i.fa.fa-warning
|
||||||
This build was retried.
|
This build was retried.
|
||||||
|
|
||||||
.gray-content-block.middle-block
|
.row-content-block.middle-block
|
||||||
.build-head
|
.build-head
|
||||||
.clearfix
|
.clearfix
|
||||||
= ci_status_with_icon(@build.status)
|
= ci_status_with_icon(@build.status)
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
%td
|
%td
|
||||||
= build.name
|
= build.name
|
||||||
|
|
||||||
|
%td
|
||||||
.label-container
|
.label-container
|
||||||
- if build.tags.any?
|
- if build.tags.any?
|
||||||
- build.tags.each do |tag|
|
- build.tags.each do |tag|
|
||||||
|
@ -76,4 +77,4 @@
|
||||||
%i.fa.fa-remove.cred
|
%i.fa.fa-remove.cred
|
||||||
- elsif defined?(allow_retry) && allow_retry && build.retryable?
|
- elsif defined?(allow_retry) && allow_retry && build.retryable?
|
||||||
= link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry' do
|
= link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry' do
|
||||||
%i.fa.fa-repeat
|
%i.fa.fa-refresh
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
.gray-content-block.middle-block
|
.row-content-block.build-content.middle-block
|
||||||
.pull-right
|
.pull-right
|
||||||
- if can?(current_user, :update_build, @project)
|
- if can?(current_user, :update_build, @project)
|
||||||
- if ci_commit.builds.latest.failed.any?(&:retryable?)
|
- if ci_commit.builds.latest.failed.any?(&:retryable?)
|
||||||
|
@ -40,6 +40,7 @@
|
||||||
%th Build ID
|
%th Build ID
|
||||||
%th Stage
|
%th Stage
|
||||||
%th Name
|
%th Name
|
||||||
|
%th Tags
|
||||||
%th Duration
|
%th Duration
|
||||||
%th Finished at
|
%th Finished at
|
||||||
- if @project.build_coverage_enabled?
|
- if @project.build_coverage_enabled?
|
||||||
|
@ -49,7 +50,7 @@
|
||||||
= render builds, coverage: @project.build_coverage_enabled?, stage: true, ref: false, allow_retry: true
|
= render builds, coverage: @project.build_coverage_enabled?, stage: true, ref: false, allow_retry: true
|
||||||
|
|
||||||
- if ci_commit.retried.any?
|
- if ci_commit.retried.any?
|
||||||
.gray-content-block.second-block
|
.row-content-block.second-block
|
||||||
Retried builds
|
Retried builds
|
||||||
|
|
||||||
.table-holder
|
.table-holder
|
||||||
|
@ -61,6 +62,7 @@
|
||||||
%th Ref
|
%th Ref
|
||||||
%th Stage
|
%th Stage
|
||||||
%th Name
|
%th Name
|
||||||
|
%th Tags
|
||||||
%th Duration
|
%th Duration
|
||||||
%th Finished at
|
%th Finished at
|
||||||
- if @project.build_coverage_enabled?
|
- if @project.build_coverage_enabled?
|
||||||
|
|
|
@ -22,10 +22,12 @@
|
||||||
%div
|
%div
|
||||||
|
|
||||||
%p
|
%p
|
||||||
%span.light Commit
|
|
||||||
= link_to @commit.id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace"
|
|
||||||
= clipboard_button(clipboard_text: @commit.id)
|
|
||||||
.commit-info-row
|
.commit-info-row
|
||||||
|
- if @commit.status
|
||||||
|
= link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "ci-status ci-#{@commit.status}" do
|
||||||
|
= ci_icon_for_status(@commit.status)
|
||||||
|
build:
|
||||||
|
= ci_label_for_status(@commit.status)
|
||||||
%span.light Authored by
|
%span.light Authored by
|
||||||
%strong
|
%strong
|
||||||
= commit_author_link(@commit, avatar: true, size: 24)
|
= commit_author_link(@commit, avatar: true, size: 24)
|
||||||
|
@ -39,19 +41,15 @@
|
||||||
#{time_ago_with_tooltip(@commit.committed_date)}
|
#{time_ago_with_tooltip(@commit.committed_date)}
|
||||||
|
|
||||||
.commit-info-row
|
.commit-info-row
|
||||||
|
%span.light Commit
|
||||||
|
= link_to @commit.id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace"
|
||||||
|
= clipboard_button(clipboard_text: @commit.id)
|
||||||
%span.cgray= pluralize(@commit.parents.count, "parent")
|
%span.cgray= pluralize(@commit.parents.count, "parent")
|
||||||
- @commit.parents.each do |parent|
|
- @commit.parents.each do |parent|
|
||||||
= link_to parent.short_id, namespace_project_commit_path(@project.namespace, @project, parent), class: "monospace"
|
= link_to parent.short_id, namespace_project_commit_path(@project.namespace, @project, parent), class: "monospace"
|
||||||
|
|
||||||
- if @commit.status
|
%span.commit-info.branches
|
||||||
.pull-right
|
%i.fa.fa-spinner.fa-spin
|
||||||
= link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "ci-status ci-#{@commit.status}" do
|
|
||||||
= ci_icon_for_status(@commit.status)
|
|
||||||
build:
|
|
||||||
= ci_label_for_status(@commit.status)
|
|
||||||
|
|
||||||
.commit-info-row.branches
|
|
||||||
%i.fa.fa-spinner.fa-spin
|
|
||||||
|
|
||||||
.commit-box.content-block
|
.commit-box.content-block
|
||||||
%h3.commit-title
|
%h3.commit-title
|
||||||
|
@ -61,4 +59,4 @@
|
||||||
= preserve(markdown(escape_once(@commit.description), pipeline: :single_line))
|
= preserve(markdown(escape_once(@commit.description), pipeline: :single_line))
|
||||||
|
|
||||||
:javascript
|
:javascript
|
||||||
$(".commit-info-row.branches").load("#{branches_namespace_project_commit_path(@project.namespace, @project, @commit.id)}");
|
$(".commit-info.branches").load("#{branches_namespace_project_commit_path(@project.namespace, @project, @commit.id)}");
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
= render "head"
|
= render "head"
|
||||||
|
|
||||||
.gray-content-block.second-block
|
.row-content-block.second-block
|
||||||
.tree-ref-holder
|
.tree-ref-holder
|
||||||
= render 'shared/ref_switcher', destination: 'commits'
|
= render 'shared/ref_switcher', destination: 'commits'
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
= render "projects/commits/header_title"
|
= render "projects/commits/header_title"
|
||||||
= render "projects/commits/head"
|
= render "projects/commits/head"
|
||||||
|
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
Compare branches, tags or commit ranges.
|
Compare branches, tags or commit ranges.
|
||||||
%br
|
%br
|
||||||
Fill input field with commit id like
|
Fill input field with commit id like
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
= render "projects/commits/head"
|
= render "projects/commits/head"
|
||||||
|
|
||||||
|
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
= render "form"
|
= render "form"
|
||||||
|
|
||||||
- if @commits.present?
|
- if @commits.present?
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
= render "home_panel"
|
= render "home_panel"
|
||||||
|
|
||||||
.gray-content-block.second-block.center
|
.row-content-block.second-block.center
|
||||||
%h3.page-title
|
%h3.page-title
|
||||||
The repository for this project is empty
|
The repository for this project is empty
|
||||||
- if can?(current_user, :push_code, @project)
|
- if can?(current_user, :push_code, @project)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
- page_title "Continuous Integration", "Graphs"
|
- page_title "Continuous Integration", "Graphs"
|
||||||
= render "header_title"
|
= render "header_title"
|
||||||
= render 'head'
|
= render 'head'
|
||||||
.gray-content-block.append-bottom-default
|
.row-content-block.append-bottom-default
|
||||||
.oneline
|
.oneline
|
||||||
A collection of graphs for Continuous Integration
|
A collection of graphs for Continuous Integration
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
= render "header_title"
|
= render "header_title"
|
||||||
= render 'head'
|
= render 'head'
|
||||||
|
|
||||||
.gray-content-block.append-bottom-default
|
.row-content-block.append-bottom-default
|
||||||
.tree-ref-holder
|
.tree-ref-holder
|
||||||
= render 'shared/ref_switcher', destination: 'graphs_commits'
|
= render 'shared/ref_switcher', destination: 'graphs_commits'
|
||||||
%ul.breadcrumb.repo-breadcrumb
|
%ul.breadcrumb.repo-breadcrumb
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
= render "header_title"
|
= render "header_title"
|
||||||
= render 'head'
|
= render 'head'
|
||||||
|
|
||||||
.gray-content-block.append-bottom-default
|
.row-content-block.append-bottom-default
|
||||||
.oneline
|
.oneline
|
||||||
Programming languages used in this repository
|
Programming languages used in this repository
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
= render "header_title"
|
= render "header_title"
|
||||||
= render 'head'
|
= render 'head'
|
||||||
|
|
||||||
.gray-content-block.append-bottom-default
|
.row-content-block.append-bottom-default
|
||||||
.tree-ref-holder
|
.tree-ref-holder
|
||||||
= render 'shared/ref_switcher', destination: 'graphs'
|
= render 'shared/ref_switcher', destination: 'graphs'
|
||||||
%ul.breadcrumb.repo-breadcrumb
|
%ul.breadcrumb.repo-breadcrumb
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
.gray-content-block.append-bottom-default
|
.row-content-block.append-bottom-default
|
||||||
.tree-ref-holder
|
.tree-ref-holder
|
||||||
= render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
|
= render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
= render "projects/commits/header_title"
|
= render "projects/commits/header_title"
|
||||||
= render "projects/commits/head"
|
= render "projects/commits/head"
|
||||||
|
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
.oneline
|
.oneline
|
||||||
.title
|
.title
|
||||||
Release notes for tag
|
Release notes for tag
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
= render 'projects/last_push'
|
= render 'projects/last_push'
|
||||||
= render "home_panel"
|
= render "home_panel"
|
||||||
|
|
||||||
.project-stats.gray-content-block.second-block
|
.project-stats.row-content-block.second-block
|
||||||
%ul.nav
|
%ul.nav
|
||||||
%li
|
%li
|
||||||
= link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
|
= link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
- page_title "Snippets"
|
- page_title "Snippets"
|
||||||
= render "header_title"
|
= render "header_title"
|
||||||
|
|
||||||
.gray-content-block.top-block
|
.row-content-block.top-block
|
||||||
.pull-right
|
.pull-right
|
||||||
= link_to new_namespace_project_snippet_path(@project.namespace, @project), class: "btn btn-new", title: "New Snippet" do
|
= link_to new_namespace_project_snippet_path(@project.namespace, @project), class: "btn btn-new", title: "New Snippet" do
|
||||||
= icon('plus')
|
= icon('plus')
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
= render "projects/commits/header_title"
|
= render "projects/commits/header_title"
|
||||||
= render "projects/commits/head"
|
= render "projects/commits/head"
|
||||||
|
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
- if can? current_user, :push_code, @project
|
- if can? current_user, :push_code, @project
|
||||||
.pull-right
|
.pull-right
|
||||||
= link_to new_namespace_project_tag_path(@project.namespace, @project), class: 'btn btn-create new-tag-btn' do
|
= link_to new_namespace_project_tag_path(@project.namespace, @project), class: 'btn btn-create new-tag-btn' do
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
= render "projects/commits/header_title"
|
= render "projects/commits/header_title"
|
||||||
= render "projects/commits/head"
|
= render "projects/commits/head"
|
||||||
|
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
.pull-right
|
.pull-right
|
||||||
- if can?(current_user, :push_code, @project)
|
- if can?(current_user, :push_code, @project)
|
||||||
= link_to edit_namespace_project_tag_release_path(@project.namespace, @project, @tag.name), class: 'btn-grouped btn has-tooltip', title: 'Edit release notes' do
|
= link_to edit_namespace_project_tag_release_path(@project.namespace, @project, @tag.name), class: 'btn-grouped btn has-tooltip', title: 'Edit release notes' do
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
= render "header_title"
|
= render "header_title"
|
||||||
|
|
||||||
= render 'nav'
|
= render 'nav'
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
%span.oneline
|
%span.oneline
|
||||||
Git access for
|
Git access for
|
||||||
%strong= @project_wiki.path_with_namespace
|
%strong= @project_wiki.path_with_namespace
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
- if @search_objects.empty?
|
- if @search_objects.empty?
|
||||||
= render partial: "search/results/empty"
|
= render partial: "search/results/empty"
|
||||||
- else
|
- else
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
= search_entries_info(@search_objects, @scope, @search_term)
|
= search_entries_info(@search_objects, @scope, @search_term)
|
||||||
- unless @show_snippets
|
- unless @show_snippets
|
||||||
- if @project
|
- if @project
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
.issues-filters
|
.issues-filters
|
||||||
.issues-details-filters.gray-content-block.second-block
|
.issues-details-filters.row-content-block.second-block
|
||||||
= form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name]), method: :get, class: 'filter-form' do
|
= form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name]), method: :get, class: 'filter-form' do
|
||||||
- if controller.controller_name == 'issues' && can?(current_user, :admin_issue, @project)
|
- if controller.controller_name == 'issues' && can?(current_user, :admin_issue, @project)
|
||||||
.check-all-holder
|
.check-all-holder
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
= button_tag "Update issues", class: "btn update_selected_issues btn-save"
|
= button_tag "Update issues", class: "btn update_selected_issues btn-save"
|
||||||
|
|
||||||
- if !@labels.nil?
|
- if !@labels.nil?
|
||||||
.gray-content-block.second-block.filtered-labels{ class: ("hidden" if !@labels.any?) }
|
.row-content-block.second-block.filtered-labels{ class: ("hidden" if !@labels.any?) }
|
||||||
- if @labels.any?
|
- if @labels.any?
|
||||||
= render "shared/labels_row", labels: @labels
|
= render "shared/labels_row", labels: @labels
|
||||||
|
|
||||||
|
|
|
@ -116,7 +116,7 @@
|
||||||
= link_to 'Change branches', mr_change_branches_path(@merge_request)
|
= link_to 'Change branches', mr_change_branches_path(@merge_request)
|
||||||
|
|
||||||
- is_footer = !(issuable.is_a?(MergeRequest) && issuable.new_record?)
|
- is_footer = !(issuable.is_a?(MergeRequest) && issuable.new_record?)
|
||||||
.gray-content-block{class: (is_footer ? "footer-block" : "middle-block")}
|
.row-content-block{class: (is_footer ? "footer-block" : "middle-block")}
|
||||||
- if issuable.new_record?
|
- if issuable.new_record?
|
||||||
= f.submit "Submit #{issuable.class.model_name.human.downcase}", class: 'btn btn-create'
|
= f.submit "Submit #{issuable.class.model_name.human.downcase}", class: 'btn btn-create'
|
||||||
- else
|
- else
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
- else
|
- else
|
||||||
= link_to 'Reopen Milestone', group_milestone_path(group, milestone.safe_title, title: milestone.title, milestone: {state_event: :activate }), method: :put, class: "btn btn-grouped btn-reopen"
|
= link_to 'Reopen Milestone', group_milestone_path(group, milestone.safe_title, title: milestone.title, milestone: {state_event: :activate }), method: :put, class: "btn btn-grouped btn-reopen"
|
||||||
|
|
||||||
.detail-page-description.milestone-detail
|
.detail-page-description.milestone-detailrow-content-block.second-block
|
||||||
%h2.title
|
%h2.title
|
||||||
= markdown escape_once(milestone.title), pipeline: :single_line
|
= markdown escape_once(milestone.title), pipeline: :single_line
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,6 @@
|
||||||
- else
|
- else
|
||||||
= render "snippets/actions"
|
= render "snippets/actions"
|
||||||
|
|
||||||
.detail-page-description.gray-content-block.second-block
|
.detail-page-description.row-content-block.second-block
|
||||||
%h2.title
|
%h2.title
|
||||||
= markdown escape_once(@snippet.title), pipeline: :single_line
|
= markdown escape_once(@snippet.title), pipeline: :single_line
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
- header_title t('sherlock.title'), sherlock_transactions_path
|
- header_title t('sherlock.title'), sherlock_transactions_path
|
||||||
|
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
.pull-right
|
.pull-right
|
||||||
= link_to(sherlock_transaction_path(@transaction), class: 'btn') do
|
= link_to(sherlock_transaction_path(@transaction), class: 'btn') do
|
||||||
%i.fa.fa-arrow-left
|
%i.fa.fa-arrow-left
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
%a(href="#tab-backtrace" data-toggle="tab")
|
%a(href="#tab-backtrace" data-toggle="tab")
|
||||||
= t('sherlock.backtrace')
|
= t('sherlock.backtrace')
|
||||||
|
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
.pull-right
|
.pull-right
|
||||||
= link_to(sherlock_transaction_path(@transaction), class: 'btn') do
|
= link_to(sherlock_transaction_path(@transaction), class: 'btn') do
|
||||||
%i.fa.fa-arrow-left
|
%i.fa.fa-arrow-left
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
- page_title t('sherlock.title')
|
- page_title t('sherlock.title')
|
||||||
- header_title t('sherlock.title'), sherlock_transactions_path
|
- header_title t('sherlock.title'), sherlock_transactions_path
|
||||||
|
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
.pull-right
|
.pull-right
|
||||||
= link_to(destroy_all_sherlock_transactions_path,
|
= link_to(destroy_all_sherlock_transactions_path,
|
||||||
class: 'btn btn-danger',
|
class: 'btn btn-danger',
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
%span.badge
|
%span.badge
|
||||||
#{@transaction.file_samples.length}
|
#{@transaction.file_samples.length}
|
||||||
|
|
||||||
.gray-content-block
|
.row-content-block
|
||||||
.pull-right
|
.pull-right
|
||||||
= link_to(sherlock_transactions_path, class: 'btn') do
|
= link_to(sherlock_transactions_path, class: 'btn') do
|
||||||
%i.fa.fa-arrow-left
|
%i.fa.fa-arrow-left
|
||||||
|
|
|
@ -85,7 +85,7 @@
|
||||||
%div{ class: container_class }
|
%div{ class: container_class }
|
||||||
.tab-content
|
.tab-content
|
||||||
#activity.tab-pane
|
#activity.tab-pane
|
||||||
.gray-content-block.calender-block.white.second-block.hidden-xs
|
.row-content-block.calender-block.white.second-block.hidden-xs
|
||||||
%div{ class: container_class }
|
%div{ class: container_class }
|
||||||
.user-calendar{data: {href: user_calendar_path}}
|
.user-calendar{data: {href: user_calendar_path}}
|
||||||
%h4.center.light
|
%h4.center.light
|
||||||
|
|
Loading…
Reference in a new issue