diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-02-10 18:44:08 +0000 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-02-14 15:22:09 -0700 |
| commit | 091d4efc6a7f12a7ff84b59b2b014ba4eb57e632 (patch) | |
| tree | 37aeb5fc6abc6fb364d3a5ff17b1f34ebc206170 /app/controllers/koding_controller.rb | |
| parent | 8c9eea04646e07d9538205c86015c2763c2878e2 (diff) | |
| download | gitlab-ce-091d4efc6a7f12a7ff84b59b2b014ba4eb57e632.tar.gz | |
Merge branch 'rs-warden-blocked-users' into 'master'
Don't perform Devise trackable updates on blocked User records
Closes #27519
See merge request !8915
Diffstat (limited to 'app/controllers/koding_controller.rb')
| -rw-r--r-- | app/controllers/koding_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/koding_controller.rb b/app/controllers/koding_controller.rb index f3759b4c0ea..6b1e64ce819 100644 --- a/app/controllers/koding_controller.rb +++ b/app/controllers/koding_controller.rb @@ -1,5 +1,5 @@ class KodingController < ApplicationController - before_action :check_integration!, :authenticate_user!, :reject_blocked! + before_action :check_integration! layout 'koding' def index |