kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Searching for issue/mr by iid in markdown

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-08-20 17:31:26 +03:00
parent a73e068c06
commit 9acaec7a26
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/project.rb
View file

@ -201,7 +201,7 @@ class Project < ActiveRecord::Base
def issue_exists?(issue_id) def issue_exists?(issue_id)
if used_default_issues_tracker? if used_default_issues_tracker?
self.issues.where(id: issue_id).first.present? self.issues.where(iid: issue_id).first.present?
else else
true true
end end

2
lib/gitlab/markdown.rb
View file

@ -181,7 +181,7 @@ module Gitlab
end end
def reference_merge_request(identifier) def reference_merge_request(identifier)
if merge_request = @project.merge_requests.where(id: identifier).first if merge_request = @project.merge_requests.where(iid: identifier).first
link_to("!#{identifier}", project_merge_request_url(@project, merge_request), html_options.merge(title: "Merge Request: #{merge_request.title}", class: "gfm gfm-merge_request #{html_options[:class]}")) link_to("!#{identifier}", project_merge_request_url(@project, merge_request), html_options.merge(title: "Merge Request: #{merge_request.title}", class: "gfm gfm-merge_request #{html_options[:class]}"))
end end
end end