Commit 9acaec7a26d7cb140e4d0215c9f3cef4e42c5087
1 parent
a73e068c
Exists in
master
and in
4 other branches
Searching for issue/mr by iid in markdown
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
app/models/project.rb
| @@ -201,7 +201,7 @@ class Project < ActiveRecord::Base | @@ -201,7 +201,7 @@ class Project < ActiveRecord::Base | ||
| 201 | 201 | ||
| 202 | def issue_exists?(issue_id) | 202 | def issue_exists?(issue_id) |
| 203 | if used_default_issues_tracker? | 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 | else | 205 | else |
| 206 | true | 206 | true |
| 207 | end | 207 | end |
lib/gitlab/markdown.rb
| @@ -181,7 +181,7 @@ module Gitlab | @@ -181,7 +181,7 @@ module Gitlab | ||
| 181 | end | 181 | end |
| 182 | 182 | ||
| 183 | def reference_merge_request(identifier) | 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 | 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]}")) | 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 | end | 186 | end |
| 187 | end | 187 | end |