summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-08-03 16:25:16 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-08-03 16:25:16 +0200
commit79aeaec98b55ef68bae9bf0a5cb61fbe4e649279 (patch)
tree12f124b08711f4ebf899031294745015c0df9119 /app/views
parent09e2d0dd59d74c2ae58150d8a3b633b9a6a45986 (diff)
downloadgitlab-ci-79aeaec98b55ef68bae9bf0a5cb61fbe4e649279.tar.gz
Rename all occurrences of type to stage
Diffstat (limited to 'app/views')
-rw-r--r--app/views/builds/_build.html.haml2
-rw-r--r--app/views/commits/_commit.html.haml2
-rw-r--r--app/views/commits/show.html.haml6
-rw-r--r--app/views/lints/_create.html.haml6
4 files changed, 8 insertions, 8 deletions
diff --git a/app/views/builds/_build.html.haml b/app/views/builds/_build.html.haml
index 598f734..4fa90c1 100644
--- a/app/views/builds/_build.html.haml
+++ b/app/views/builds/_build.html.haml
@@ -7,7 +7,7 @@
%strong Build ##{build.id}
%td
- = build.job_type
+ = build.stage
%td
= build.name
diff --git a/app/views/commits/_commit.html.haml b/app/views/commits/_commit.html.haml
index a273f09..59e116a 100644
--- a/app/views/commits/_commit.html.haml
+++ b/app/views/commits/_commit.html.haml
@@ -3,7 +3,7 @@
= commit.status
- if commit.running?
&middot;
- = commit.job_type
+ = commit.stage
%td.build-link
diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml
index d335754..2c1f40c 100644
--- a/app/views/commits/show.html.haml
+++ b/app/views/commits/show.html.haml
@@ -49,7 +49,7 @@
- unless @commit.push_data[:ci_yaml_file]
.bs-callout.bs-callout-warning
\.gitlab-ci.yml not found in this commit
-
+
%h3 Status
.build.alert{class: commit_status_alert_class(@commit)}
@@ -68,7 +68,7 @@
%tr
%th Status
%th Build ID
- %th Type
+ %th Stage
%th Name
%th Duration
%th Finished at
@@ -86,7 +86,7 @@
%tr
%th Status
%th Build ID
- %th Type
+ %th Stage
%th Name
%th Duration
%th Finished at
diff --git a/app/views/lints/_create.html.haml b/app/views/lints/_create.html.haml
index f82b406..458af71 100644
--- a/app/views/lints/_create.html.haml
+++ b/app/views/lints/_create.html.haml
@@ -10,10 +10,10 @@
%th Parameter
%th Value
%tbody
- - @types.each do |type|
- - @builds.select { |build| build[:type] == type }.each do |build|
+ - @stages.each do |stage|
+ - @builds.select { |build| build[:stage] == stage }.each do |build|
%tr
- %td #{type.capitalize} Job - #{build[:name]}
+ %td #{stage.capitalize} Job - #{build[:name]}
%td
%pre
= simple_format build[:script]