summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-20 16:56:05 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-20 16:56:05 +0300
commita73e068c06532480137b8b9861ed88f42578bb12 (patch)
tree88d51471ba62aa9a7315a6775ea7a97baac73d69 /app
parent434c034159f584348b56a322dbcda8dc65b812f2 (diff)
downloadgitlab-ce-a73e068c06532480137b8b9861ed88f42578bb12.tar.gz
Fixing tests after adding iid for issues/mr
Diffstat (limited to 'app')
-rw-r--r--app/helpers/issues_helper.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 4f433f3c60d..5977c9cbae2 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -37,23 +37,23 @@ module IssuesHelper
end
end
- def url_for_issue(issue_id)
+ def url_for_issue(issue_iid)
return "" if @project.nil?
if @project.used_default_issues_tracker?
- url = project_issue_url project_id: @project, id: issue_id
+ url = project_issue_url project_id: @project, id: issue_iid
else
url = Gitlab.config.issues_tracker[@project.issues_tracker]["issues_url"]
- url.gsub(':id', issue_id.to_s)
+ url.gsub(':id', issue_iid.to_s)
.gsub(':project_id', @project.id.to_s)
.gsub(':issues_tracker_id', @project.issues_tracker_id.to_s)
end
end
- def title_for_issue(issue_id)
+ def title_for_issue(issue_iid)
return "" if @project.nil?
- if @project.used_default_issues_tracker? && issue = @project.issues.where(id: issue_id).first
+ if @project.used_default_issues_tracker? && issue = @project.issues.where(iid: issue_iid).first
issue.title
else
""