diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-08 14:11:39 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-08 14:11:39 +0000 |
| commit | f8988b3d4909c4ebef3ab57bdf7e02716360b274 (patch) | |
| tree | 998f806e9da3bf17f2d65e794cdf41d76f89b8f1 /app | |
| parent | 5db9c791e54b21e4cf440e4615f3b08e2ba4dd13 (diff) | |
| parent | ebc44befdc773b39a171d38dc13c38cd6630828a (diff) | |
| download | gitlab-ce-f8988b3d4909c4ebef3ab57bdf7e02716360b274.tar.gz | |
Merge branch '24255-search-fix' into 'master'
Fix broken commits search
## What does this MR do?
Fixes commits search
## What are the relevant issue numbers?
Closes #24255
See merge request !7339
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/search_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/search/results/_commit.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index d01e0dedf52..b666aa01d6b 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -16,7 +16,7 @@ class SearchController < ApplicationController @group = nil unless can?(current_user, :read_group, @group) end - return if params[:search].nil? || params[:search].blank? + return if params[:search].blank? @search_term = params[:search] diff --git a/app/views/search/results/_commit.html.haml b/app/views/search/results/_commit.html.haml index 5b2d83d6b92..f34eaf89027 100644 --- a/app/views/search/results/_commit.html.haml +++ b/app/views/search/results/_commit.html.haml @@ -1 +1 @@ -= render 'projects/commits/commit', project: @project, commit: commit += render 'projects/commits/commit', project: @project, commit: commit, ref: nil |