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>2015-10-02 14:46:38 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2015-10-05 10:52:35 +0300
commit546a3c6561fbe967cc37ccc3229b71893cd20c34 (patch)
tree0828ab3fb82e2b03921a8f4d1f745f430bae4bd6 /app/helpers/ci
parent0de7c83a78711601b40b5a739070da2e3af29b11 (diff)
Refactor commit and build
Diffstat (limited to 'app/helpers/ci')
-rw-r--r--app/helpers/ci/commits_helper.rb2
-rw-r--r--app/helpers/ci/gitlab_helper.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/ci/commits_helper.rb b/app/helpers/ci/commits_helper.rb
index 9069aed5b4d..a0df4c3d72d 100644
--- a/app/helpers/ci/commits_helper.rb
+++ b/app/helpers/ci/commits_helper.rb
@@ -1,7 +1,7 @@
module Ci
module CommitsHelper
def ci_commit_path(commit)
- ci_project_ref_commits_path(commit.project, commit.ref, commit.sha)
+ ci_project_commits_path(commit.project, commit)
end
def commit_link(commit)
diff --git a/app/helpers/ci/gitlab_helper.rb b/app/helpers/ci/gitlab_helper.rb
index 13e4d0fd9c3..baddbc806f2 100644
--- a/app/helpers/ci/gitlab_helper.rb
+++ b/app/helpers/ci/gitlab_helper.rb
@@ -26,7 +26,7 @@ module Ci
def yaml_web_editor_link(project)
commits = project.commits
- if commits.any? && commits.last.push_data[:ci_yaml_file]
+ if commits.any? && commits.last.ci_yaml_file
"#{project.gitlab_url}/edit/master/.gitlab-ci.yml"
else
"#{project.gitlab_url}/new/master"