Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq

app/contexts/search_context.rb

@@ -7,6 +7,7 @@ class SearchContext
 
   def execute
     query = params[:search]
+    query = Shellwords.shellescape(query) if query.present?
 
     return result unless query.present?
 

doc/install/installation.md

@@ -122,7 +122,7 @@ GitLab Shell is an ssh access and repository management software developed speci
     cd gitlab-shell
 
     # switch to right version
-    sudo -u git -H git checkout v1.7.1
+    sudo -u git -H git checkout v1.7.4
 
     sudo -u git -H cp config.yml.example config.yml
 

lib/tasks/gitlab/check.rake

@@ -736,7 +736,7 @@ namespace :gitlab do
   end
 
   def check_gitlab_shell
-    required_version = Gitlab::VersionInfo.new(1, 7, 1)
+    required_version = Gitlab::VersionInfo.new(1, 7, 4)
     current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
 
     print "GitLab Shell version >= #{required_version} ? ... "

lib/tasks/sidekiq.rake

@@ -4,11 +4,13 @@ namespace :sidekiq do
     system "script/background_jobs stop"
   end
 
-  desc "GITLAB | Start sidekiq" do
+  desc "GITLAB | Start sidekiq"
+  task :start do
     system "script/background_jobs start"
   end
 
-  desc 'GitLab | Restart sidekiq' do
+  desc 'GitLab | Restart sidekiq'
+  task :restart do
     system "script/background_jobs restart"
   end