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
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-11 14:05:31 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-11 14:05:31 +0300
commit0615de013d1e30d147ca7c62fa62a251567337b1 (patch)
tree29a0ef63f222209d9e31baf3e54e01d8f224c62d /app
parenta8dd4d36e2ba2bcf2488ce12aa0809c339653fc8 (diff)
Fix ci commits features specs
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/ci/sections/builds.scss8
-rw-r--r--app/controllers/ci/commits_controller.rb2
-rw-r--r--app/helpers/ci/commits_helper.rb6
3 files changed, 14 insertions, 2 deletions
diff --git a/app/assets/stylesheets/ci/sections/builds.scss b/app/assets/stylesheets/ci/sections/builds.scss
index a9d39bb0cbd..600919635d0 100644
--- a/app/assets/stylesheets/ci/sections/builds.scss
+++ b/app/assets/stylesheets/ci/sections/builds.scss
@@ -52,3 +52,11 @@ pre.trace {
color: #777;
}
}
+
+.alert-disabled {
+ background: #EEE;
+
+ a {
+ color: #3084bb !important;
+ }
+}
diff --git a/app/controllers/ci/commits_controller.rb b/app/controllers/ci/commits_controller.rb
index bad9075dde6..0f7f5485661 100644
--- a/app/controllers/ci/commits_controller.rb
+++ b/app/controllers/ci/commits_controller.rb
@@ -21,7 +21,7 @@ module Ci
def cancel
commit.builds.running_or_pending.each(&:cancel)
- redirect_to ci_project_ref_commit_path(project, commit.ref, commit.sha)
+ redirect_to ci_project_ref_commits_path(project, commit.ref, commit.sha)
end
private
diff --git a/app/helpers/ci/commits_helper.rb b/app/helpers/ci/commits_helper.rb
index 748d12138b1..86f254223cb 100644
--- a/app/helpers/ci/commits_helper.rb
+++ b/app/helpers/ci/commits_helper.rb
@@ -15,8 +15,12 @@ module Ci
end
end
+ def ci_commit_path(commit)
+ ci_project_ref_commits_path(commit.project, commit.ref, commit.sha)
+ end
+
def commit_link(commit)
- link_to(commit.short_sha, ci_project_ref_commits_path(commit.project, commit.ref, commit.sha))
+ link_to(commit.short_sha, ci_commit_path(commit))
end
def truncate_first_line(message, length = 50)