From 241f5971ba657960a316fd3e43c7db5a6de41969 Mon Sep 17 00:00:00 2001
From: Nikita Verkhovin <vernik91@gmail.com>
Date: Sun, 17 May 2015 23:32:58 +0600
Subject: [PATCH] Add search issues/MR by number

---
 CHANGELOG                                        |  2 +-
 app/controllers/projects/issues_controller.rb    | 10 +++++++++-
 .../projects/merge_requests_controller.rb        | 10 +++++++++-
 lib/gitlab/search_results.rb                     | 16 ++++++++++++++--
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 11eeac01081..b0c2bb74e4c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -45,7 +45,7 @@ v 7.11.0 (unreleased)
   - Fix bug where Slack service channel was not saved in admin template settings. (Stan Hu)
   - Protect OmniAuth request phase against CSRF.
   - Don't send notifications to mentioned users that don't have access to the project in question.
-  -
+  - Add search issues/MR by number
   - Move snippets UI to fluid layout
   - Improve UI for sidebar. Increase separation between navigation and content
   - Improve new project command options (Ben Bodenmiller)
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index c524e1a0ea3..7d168aa827b 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -19,7 +19,15 @@ class Projects::IssuesController < Projects::ApplicationController
   def index
     terms = params['issue_search']
     @issues = get_issues_collection
-    @issues = @issues.full_search(terms) if terms.present?
+
+    if terms.present?
+      if terms =~ /\A#(\d+)\z/
+        @issues = @issues.where(iid: $1)
+      else
+        @issues = @issues.full_search(terms)
+      end
+    end
+
     @issues = @issues.page(params[:page]).per(PER_PAGE)
 
     respond_to do |format|
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 5b93e95866a..c7467e9b2f5 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -19,7 +19,15 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   def index
     terms = params['issue_search']
     @merge_requests = get_merge_requests_collection
-    @merge_requests = @merge_requests.full_search(terms) if terms.present?
+
+    if terms.present?
+      if terms =~ /\A[#!](\d+)\z/
+        @merge_requests = @merge_requests.where(iid: $1)
+      else
+        @merge_requests = @merge_requests.full_search(terms)
+      end
+    end
+    
     @merge_requests = @merge_requests.page(params[:page]).per(PER_PAGE)
 
     respond_to do |format|
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb
index 75a3dfe37c3..06245374bc8 100644
--- a/lib/gitlab/search_results.rb
+++ b/lib/gitlab/search_results.rb
@@ -51,11 +51,23 @@ module Gitlab
     end
 
     def issues
-      Issue.where(project_id: limit_project_ids).full_search(query).order('updated_at DESC')
+      issues = Issue.where(project_id: limit_project_ids)
+      if query =~ /#(\d+)\z/
+        issues = issues.where(iid: $1)
+      else
+        issues = issues.full_search(query)
+      end
+      issues.order('updated_at DESC')
     end
 
     def merge_requests
-      MergeRequest.in_projects(limit_project_ids).full_search(query).order('updated_at DESC')
+      merge_requests = MergeRequest.in_projects(limit_project_ids)
+      if query =~ /[#!](\d+)\z/
+        merge_requests = merge_requests.where(iid: $1)
+      else
+        merge_requests = merge_requests.full_search(query)
+      end
+      merge_requests.order('updated_at DESC')
     end
 
     def default_scope