Remove set of thread variables

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

4 files changed, 1 insertions, 34 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index aa532de7aa4..685d41a5520 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -4,7 +4,6 @@ class ApplicationController < ActionController::Base
   before_filter :authenticate_user!
   before_filter :reject_blocked!
   before_filter :check_password_expiration
-  around_filter :set_current_user_for_thread
   before_filter :add_abilities
   before_filter :ldap_security_check
   before_filter :dev_tools if Rails.env == 'development'
@@ -53,15 +52,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def set_current_user_for_thread
-    Thread.current[:current_user] = current_user
-    begin
-      yield
-    ensure
-      Thread.current[:current_user] = nil
-    end
-  end
-
   def abilities
     @abilities ||= Six.new
   end
diff --git a/app/observers/base_observer.rb b/app/observers/base_observer.rb
index d685bd5d819..260d1f05db3 100644
--- a/app/observers/base_observer.rb
+++ b/app/observers/base_observer.rb
@@ -10,12 +10,4 @@ class BaseObserver < ActiveRecord::Observer
   def log_info message
     Gitlab::AppLogger.info message
   end
-
-  def current_user
-    Thread.current[:current_user]
-  end
-
-  def current_commit
-    Thread.current[:current_commit]
-  end
 end
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 654c1f62c6c..b6a5806d646 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -36,16 +36,6 @@ module API
       end
     end
 
-    def set_current_user_for_thread
-      Thread.current[:current_user] = current_user
-
-      begin
-        yield
-      ensure
-        Thread.current[:current_user] = nil
-      end
-    end
-
     def user_project
       @project ||= find_project(params[:id])
       @project || not_found!
diff --git a/lib/gitlab/seeder.rb b/lib/gitlab/seeder.rb
index 39de1223b18..31aa3528c4c 100644
--- a/lib/gitlab/seeder.rb
+++ b/lib/gitlab/seeder.rb
@@ -9,12 +9,7 @@ module Gitlab
     end
 
     def self.by_user(user)
-      begin
-        Thread.current[:current_user] = user
-        yield
-      ensure
-        Thread.current[:current_user] = nil
-      end
+      yield
     end
 
     def self.mute_mailer