Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-04-13 16:58:22 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-04-13 16:58:22 +0300
commit251a78022d12c62ff738540d4104bbf0730ef234 (patch)
tree974e0f82fcc947a6ca5abf742fc87ebd406ce4cc /app/views/projects
parent4af0968c43d517a3d702658749b5117ba4b9e11a (diff)
Cleanup changes
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/_last_commit.html.haml2
-rw-r--r--app/views/projects/builds/show.html.haml6
-rw-r--r--app/views/projects/ci/commits/_commit.html.haml0
-rw-r--r--app/views/projects/ci_commits/_header_title.html.haml0
-rw-r--r--app/views/projects/ci_commits/index.html.haml0
-rw-r--r--app/views/projects/ci_commits/new.html.haml0
6 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/_last_commit.html.haml b/app/views/projects/_last_commit.html.haml
index 6eccbaa4bfa..66c30283c7a 100644
--- a/app/views/projects/_last_commit.html.haml
+++ b/app/views/projects/_last_commit.html.haml
@@ -1,6 +1,6 @@
.project-last-commit
- if commit.status
- = link_to project_commit_path(commit.project, commit), class: "ci-status ci-#{commit.status}" do
+ = link_to builds_namespace_project_commit_path(commit.project.namespace, commit.project, commit), class: "ci-status ci-#{commit.status}" do
= ci_icon_for_status(commit.status)
= ci_label_for_status(commit.status)
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 20160a718bc..b50b2cf3764 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -4,7 +4,7 @@
.build-page
.gray-content-block.top-block
Build ##{@build.id} for commit
- %strong.monospace= link_to @build.commit.short_sha, builds_namespace_project_commit_path(@project.namespace, @project, @build.sha)
+ %strong.monospace= link_to @build.commit.short_sha, ci_status_path(@build.commit)
from
= link_to @build.ref, namespace_project_commits_path(@project.namespace, @project, @build.ref)
- merge_request = @build.merge_request
@@ -173,7 +173,7 @@
Commit
.pull-right
%small
- = link_to @build.commit.short_sha, builds_namespace_project_commit_path(@project.namespace, @project, @build.sha), class: "monospace"
+ = link_to @build.commit.short_sha, ci_status_path(@build.commit), class: "monospace"
%p
%span.attr-name Branch:
= link_to @build.ref, namespace_project_commits_path(@project.namespace, @project, @build.ref)
@@ -196,7 +196,7 @@
.build-widget
%h4.title #{pluralize(@builds.count(:id), "other build")} for
= succeed ":" do
- = link_to @build.commit.short_sha, builds_namespace_project_commit_path(@project.namespace, @project, @build.sha), class: "monospace"
+ = link_to @build.commit.short_sha, ci_status_path(@build.commit), class: "monospace"
%table.table.builds
- @builds.each_with_index do |build, i|
%tr.build
diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ /dev/null
diff --git a/app/views/projects/ci_commits/_header_title.html.haml b/app/views/projects/ci_commits/_header_title.html.haml
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/app/views/projects/ci_commits/_header_title.html.haml
+++ /dev/null
diff --git a/app/views/projects/ci_commits/index.html.haml b/app/views/projects/ci_commits/index.html.haml
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/app/views/projects/ci_commits/index.html.haml
+++ /dev/null
diff --git a/app/views/projects/ci_commits/new.html.haml b/app/views/projects/ci_commits/new.html.haml
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/app/views/projects/ci_commits/new.html.haml
+++ /dev/null