summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-07-06 12:16:30 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-07-06 12:52:31 +0200
commit586d68042f66781b05f26ea44b00372d0d573c14 (patch)
treedbfc3d71d22ca9ead4a02968e8dc6d7d0ea7b022
parent4eebf9600e43cf6b0abffe0ffcde20cffc9b2800 (diff)
downloadgitlab-ci-586d68042f66781b05f26ea44b00372d0d573c14.tar.gz
Remove old sessions in order to force a new access_token access
-rw-r--r--app/controllers/application_controller.rb6
-rw-r--r--db/migrate/20150706103229_truncate_sessions.rb9
2 files changed, 9 insertions, 6 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8700317..9852736 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -12,12 +12,6 @@ class ApplicationController < ActionController::Base
def current_user
@current_user ||= session[:current_user]
-
- # Backward compatibility. Until 7.13 user session doesn't contain access_token
- # Users with old session should be logged out
- return nil if @current_user && @current_user.access_token.nil?
-
- @current_user
end
def sign_in(user)
diff --git a/db/migrate/20150706103229_truncate_sessions.rb b/db/migrate/20150706103229_truncate_sessions.rb
new file mode 100644
index 0000000..32fe651
--- /dev/null
+++ b/db/migrate/20150706103229_truncate_sessions.rb
@@ -0,0 +1,9 @@
+class TruncateSessions < ActiveRecord::Migration
+ def up
+ execute('DELETE FROM sessions')
+ end
+
+ def down
+ execute('DELETE FROM sessions')
+ end
+end