From 410f2b40f2579b2e6a77591157900ce07512ee36 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 13 Apr 2016 16:39:23 +0200
Subject: [PATCH] Remove unneeded changes
---
app/assets/stylesheets/framework/tables.scss | 16 ----------------
app/views/layouts/nav/_project.html.haml | 2 +-
app/views/projects/commit/_ci_commit.html.haml | 2 +-
3 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss
index 9d6a6c5b237..75b770ae5a2 100644
--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
@@ -34,22 +34,6 @@ table {
font-weight: normal;
font-size: 15px;
border-bottom: 1px solid $border-color;
-
- .rotate {
- height: 140px;
- white-space: nowrap;
- transform:
- /* Magic Numbers */
- translate(25px, 51px)
- /* 45 is really 360 - 45 */
- rotate(315deg);
- width: 30px;
- }
-
- .rotate > div > span {
- border-bottom: 1px solid #ccc;
- padding: 5px 10px;
- }
}
td {
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index b58d8270230..f4797a85bb7 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -39,7 +39,7 @@
Commits
- if project_nav_tab? :builds
- = nav_link(controller: %w(ci_commits)) do
+ = nav_link(controller: %w(pipelines)) do
= link_to project_pipelines_path(@project), title: 'Pipelines', class: 'shortcuts-builds' do
= icon('ship fw')
%span
diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index 2ec3c809e1c..cf101acbb53 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -20,7 +20,7 @@
for commit
= link_to ci_commit.short_sha, namespace_project_commit_path(@project.namespace, @project, ci_commit.sha), class: "monospace"
- if ci_commit.duration > 0
- took
+ in
= time_interval_in_words ci_commit.duration
- if ci_commit.yaml_errors.present?
--
GitLab