gitlab-shell_bin-use-rbenv.patch

diff --git a/bin/check b/bin/check
index e0c34ee..bfbb21b 100755
--- a/bin/check
+++ b/bin/check
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/home/git/.rbenv/shims/ruby
 
 require_relative '../lib/gitlab_init'
 require_relative '../lib/gitlab_net'
diff --git a/bin/gitlab-keys b/bin/gitlab-keys
index 2a8aea1..3af0ef7 100755
--- a/bin/gitlab-keys
+++ b/bin/gitlab-keys
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/home/git/.rbenv/shims/ruby
 
 require_relative '../lib/gitlab_init'
 
diff --git a/bin/gitlab-projects b/bin/gitlab-projects
index 01de20b..83e005d 100755
--- a/bin/gitlab-projects
+++ b/bin/gitlab-projects
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/home/git/.rbenv/shims/ruby
 
 
 require_relative '../lib/gitlab_init'
diff --git a/bin/gitlab-shell b/bin/gitlab-shell
index 4b3dc16..567b263 100755
--- a/bin/gitlab-shell
+++ b/bin/gitlab-shell
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/home/git/.rbenv/shims/ruby
 
 unless ENV['SSH_CONNECTION']
   puts "Only ssh allowed"
diff --git a/bin/install b/bin/install
index f8c12f8..0fb3858 100755
--- a/bin/install
+++ b/bin/install
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/home/git/.rbenv/shims/ruby
 
 require_relative '../lib/gitlab_init'
 

gitlab_add_old_issue_url.patch

diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index e8f845b..abe2c67 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -40,6 +40,10 @@ class Projects::IssuesController < Projects::ApplicationController
     respond_with(@issue)
   end
 
+  def old
+    redirect_old
+  end
+
   def show
     @note = @project.notes.new(noteable: @issue)
     @target_type = :issue
diff --git a/config/routes.rb b/config/routes.rb
index 6d73586..1f860d8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -282,6 +282,9 @@ Gitlab::Application.routes.draw do
         collection do
           post  :bulk_update
         end
+        member do
+          get   :old
+        end
       end
 
       resources :team_members, except: [:index, :edit], constraints: { id: /[a-zA-Z.\/0-9_\-#%+]+/ } do

gitlab_script-background_jobs-bugfix_killall_kill_parent_process.patch

diff --git a/script/background_jobs b/script/background_jobs
index 623e26a..5a75f76 100755
--- a/script/background_jobs
+++ b/script/background_jobs
@@ -13,7 +13,7 @@ function stop
 
 function killall
 {
-  pkill -u $gitlab_user -f sidekiq
+  pkill -u $gitlab_user -f sidekiq -P 1
 }
 
 function restart