Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-10 18:51:49 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-10 18:51:49 +0400
commita7be3dfa30a452b307d1fdc0b4157ecbe908da8d (patch)
treecde495aa94b979902836a1605c727ee5ac53d0ec /app
parent772f2f1ac8aab40a2cd62f285af131eb61ad12bb (diff)
Remove set of thread variables
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/controllers/application_controller.rb10
-rw-r--r--app/observers/base_observer.rb8
2 files changed, 0 insertions, 18 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