6 2 stable (!10017) · Merge requests · gpt / large_projects / gitlabhq1 · GitLab

Snippets Groups Projects

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

An error occurred while fetching the assigned milestone of the selected merge_request.

Closed gitlab-qa-bot requested to merge 6-2-stable into master 9 years ago

Viewing commit 31736e9b

Show latest version

1 file

+ 2

− 1

31736e9b

Correctly escape search query · 31736e9b
Dmitriy Zaporozhets authored 11 years ago

Conflict: This file was modified in the source branch, but removed in the target branch. Ask someone with write access to resolve it.

app/contexts/search_context.rb

+ 2

− 1

@@ -6,7 +6,8 @@ class SearchContext
@@ -6,7 +6,8 @@ class SearchContext
  end
  end


  def execute
  def execute
    query = Shellwords.shellescape(params[:search])
    query = params[:search]
    query = Shellwords.shellescape(query) if query.present?


    return result unless query.present?
    return result unless query.present?