From 9acaec7a26d7cb140e4d0215c9f3cef4e42c5087 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 20 Aug 2013 17:31:26 +0300 Subject: [PATCH] Searching for issue/mr by iid in markdown --- app/models/project.rb | 2 +- lib/gitlab/markdown.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/project.rb b/app/models/project.rb index de77bf1c666..47916610a75 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -201,7 +201,7 @@ class Project < 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 diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index 95bb22cfc27..61c622a448a 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -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