Skip to content
Snippets Groups Projects
Commit c5f5ce88 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files

Fix broken tests

Rename Build to Job

Replace "Builds" by "Jobs" and fix broken specs

Replace "Builds" by "Jobs"

Fix broken spinach test

Fix broken test

Remove `˙` at the beginning of the file

Fix broken spinach test

Fix broken tests

Changes after review
parent 5b0f492b
No related branches found
No related tags found
No related merge requests found
Showing
with 29 additions and 29 deletions
Loading
Loading
@@ -180,7 +180,7 @@
<tr>
<th class="environments-name">Environment</th>
<th class="environments-deploy">Last deployment</th>
<th class="environments-build">Build</th>
<th class="environments-build">Job</th>
<th class="environments-commit">Commit</th>
<th class="environments-date">Updated</th>
<th class="hidden-xs environments-actions"></th>
Loading
Loading
Loading
Loading
@@ -26,9 +26,9 @@
v-if='actions'
class="dropdown-toggle btn btn-default has-tooltip js-pipeline-dropdown-manual-actions"
data-toggle="dropdown"
title="Manual build"
title="Manual job"
data-placement="top"
aria-label="Manual build"
aria-label="Manual job"
>
<span v-html='svgs.iconPlay' aria-hidden="true"></span>
<i class="fa fa-caret-down" aria-hidden="true"></i>
Loading
Loading
Loading
Loading
@@ -204,7 +204,7 @@
.col-sm-10
= f.number_field :max_artifacts_size, class: 'form-control'
.help-block
Set the maximum file size each build's artifacts can have
Set the maximum file size each jobs's artifacts can have
= link_to "(?)", help_page_path("user/admin_area/settings/continuous_integration", anchor: "maximum-artifacts-size")
 
- if Gitlab.config.registry.enabled
Loading
Loading
Loading
Loading
@@ -143,7 +143,7 @@
.key g
.key b
%td
Go to builds
Go to jobs
%tr
%td.shortcut
.key g
Loading
Loading
Loading
Loading
@@ -96,8 +96,8 @@
-# Shortcut to builds page
- if project_nav_tab? :builds
%li.hidden
= link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds' do
Builds
= link_to project_builds_path(@project), title: 'Jobs', class: 'shortcuts-builds' do
Jobs
 
-# Shortcut to commits page
- if project_nav_tab? :commits
Loading
Loading
- content_for :header do
%h1{ style: "background: #c40834; color: #FFF; font: normal 20px Helvetica, Arial, sans-serif; margin: 0; padding: 5px 10px; line-height: 32px; font-size: 16px;" }
GitLab (build failed)
GitLab (job failed)
 
%h3
Project:
Loading
Loading
@@ -21,4 +21,4 @@
Message: #{@build.pipeline.git_commit_message}
 
%p
Build details: #{link_to "Build #{@build.id}", namespace_project_build_url(@build.project.namespace, @build.project, @build)}
Job details: #{link_to "Job #{@build.id}", namespace_project_build_url(@build.project.namespace, @build.project, @build)}
Build failed for <%= @project.name %>
Job failed for <%= @project.name %>
 
Status: <%= @build.status %>
Commit: <%= @build.pipeline.short_sha %>
Loading
Loading
- content_for :header do
%h1{ style: "background: #38CF5B; color: #FFF; font: normal 20px Helvetica, Arial, sans-serif; margin: 0; padding: 5px 10px; line-height: 32px; font-size: 16px;" }
GitLab (build successful)
GitLab (job successful)
 
%h3
Project:
Loading
Loading
@@ -21,4 +21,4 @@
Message: #{@build.pipeline.git_commit_message}
 
%p
Build details: #{link_to "Build #{@build.id}", namespace_project_build_url(@build.project.namespace, @build.project, @build)}
Job details: #{link_to "Job #{@build.id}", namespace_project_build_url(@build.project.namespace, @build.project, @build)}
Build successful for <%= @project.name %>
Job successful for <%= @project.name %>
 
Status: <%= @build.status %>
Commit: <%= @build.pipeline.short_sha %>
Loading
Loading
Build #<%= build.id %> ( <%= pipeline_build_url(pipeline, build) %> )
Job #<%= build.id %> ( <%= pipeline_build_url(pipeline, build) %> )
Build #<%= build.id %>
Job #<%= build.id %>
Loading
Loading
@@ -3,6 +3,6 @@
%h4
Customize your workflow!
%p
Get started with GitLab by enabling features that work best for your project. From issues and wikis, to merge requests and builds, GitLab can help manage your workflow from idea to production!
Get started with GitLab by enabling features that work best for your project. From issues and wikis, to merge requests and pipelines, GitLab can help manage your workflow from idea to production!
- if can?(current_user, :admin_project, @project)
= link_to "Get started", edit_project_path(@project), class: "btn btn-success"
- page_title 'Artifacts', "#{@build.name} (##{@build.id})", 'Builds'
- page_title 'Artifacts', "#{@build.name} (##{@build.id})", 'Jobs'
 
.top-block.row-content-block.clearfix
.pull-right
Loading
Loading
Loading
Loading
@@ -17,6 +17,6 @@
= render "user"
= time_ago_with_tooltip(@build.created_at)
- if can?(current_user, :update_build, @build) && @build.retryable?
= link_to "Retry build", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'btn btn-inverted-secondary pull-right', method: :post
= link_to "Retry job", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'btn btn-inverted-secondary pull-right', method: :post
%button.btn.btn-default.pull-right.visible-xs-block.visible-sm-block.build-gutter-toggle.js-sidebar-build-toggle{ role: "button", type: "button" }
= icon('angle-double-left')
Loading
Loading
@@ -44,7 +44,7 @@
.title
Job details
- if can?(current_user, :update_build, @build) && @build.retryable?
= link_to "Retry build", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'pull-right retry-link', method: :post
= link_to "Retry job", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'pull-right retry-link', method: :post
- if @build.merge_request
%p.build-detail-row
%span.build-light-text Merge Request:
Loading
Loading
Loading
Loading
@@ -12,14 +12,14 @@
.bs-callout.bs-callout-warning
%p
- if no_runners_for_project?(@build.project)
This build is stuck, because the project doesn't have any runners online assigned to it.
This job is stuck, because the project doesn't have any runners online assigned to it.
- elsif @build.tags.any?
This build is stuck, because you don't have any active runners online with any of these tags assigned to them:
This job is stuck, because you don't have any active runners online with any of these tags assigned to them:
- @build.tags.each do |tag|
%span.label.label-primary
= tag
- else
This build is stuck, because you don't have any active runners that can run this build.
This job is stuck, because you don't have any active runners that can run this job.
 
%br
Go to
Loading
Loading
Loading
Loading
@@ -32,10 +32,10 @@
= link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "commit-id monospace"
 
- if build.stuck?
= icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.')
= icon('warning', class: 'text-warning has-tooltip', title: 'Job is stuck. Check runners.')
 
- if retried
= icon('refresh', class: 'text-warning has-tooltip', title: 'Build was retried')
= icon('refresh', class: 'text-warning has-tooltip', title: 'Job was retried')
 
.label-container
- if build.tags.any?
Loading
Loading
Loading
Loading
@@ -15,7 +15,7 @@
- else
%span.api.monospace API
- if pipeline.latest?
%span.label.label-success.has-tooltip{ title: 'Latest build for this branch' } latest
%span.label.label-success.has-tooltip{ title: 'Latest job for this branch' } latest
- if pipeline.triggered?
%span.label.label-primary triggered
- if pipeline.yaml_errors.present?
Loading
Loading
@@ -78,7 +78,7 @@
.btn-group.inline
- if actions.any?
.btn-group
%button.dropdown-toggle.btn.btn-default.has-tooltip.js-pipeline-dropdown-manual-actions{ type: 'button', title: 'Manual build', data: { toggle: 'dropdown', placement: 'top' }, 'aria-label' => 'Manual build' }
%button.dropdown-toggle.btn.btn-default.has-tooltip.js-pipeline-dropdown-manual-actions{ type: 'button', title: 'Manual job', data: { toggle: 'dropdown', placement: 'top' }, 'aria-label' => 'Manual job' }
= custom_icon('icon_play')
= icon('caret-down', 'aria-hidden' => 'true')
%ul.dropdown-menu.dropdown-menu-align-right
Loading
Loading
Loading
Loading
@@ -13,7 +13,7 @@
Pipeline
= link_to "##{pipeline.id}", namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id), class: "monospace"
with
= pluralize pipeline.statuses.count(:id), "build"
= pluralize pipeline.statuses.count(:id), "job"
- if pipeline.ref
for
= link_to pipeline.ref, namespace_project_commits_path(pipeline.project.namespace, pipeline.project, pipeline.ref), class: "monospace"
Loading
Loading
@@ -44,7 +44,7 @@
%thead
%tr
%th Status
%th Build ID
%th Job ID
%th Name
%th
- if pipeline.project.build_coverage_enabled?
Loading
Loading
Loading
Loading
@@ -32,7 +32,7 @@
%tr
%th ID
%th Commit
%th Build
%th Job
%th Created
%th.hidden-xs
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment