Searching for issue/mr by iid in markdown

Dmitriy Zaporozhets
1 parent a73e068c
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
app/models/project.rb
lib/gitlab/markdown.rb
@@ -201,7 +201,7 @@ class Project &lt; ActiveRecord::Base
  
   def issue_exists?(issue_id)
     if used_default_issues_tracker?
-      self.issues.where(id: issue_id).first.present?
+      self.issues.where(iid: issue_id).first.present?
     else
       true
     end
@@ -181,7 +181,7 @@ module Gitlab
     end
  
     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]}"))
       end
     end
...	...	@@ -201,7 +201,7 @@ class Project < ActiveRecord::Base
201	201
202	202	def issue_exists?(issue_id)
203	203	if used_default_issues_tracker?
204		- self.issues.where(id: issue_id).first.present?
	204	+ self.issues.where(iid: issue_id).first.present?
205	205	else
206	206	true
207	207	end
...	...
...	...	@@ -181,7 +181,7 @@ module Gitlab
181	181	end
182	182
183	183	def reference_merge_request(identifier)
184		- if merge_request = @project.merge_requests.where(id: identifier).first
	184	+ if merge_request = @project.merge_requests.where(iid: identifier).first
185	185	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]}"))
186	186	end
187	187	end
...	...