diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-16 08:35:08 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-16 08:35:08 +0000 |
| commit | 59af98f133ee229479c6159b15391deb4782a294 (patch) | |
| tree | 8a1034a4d2239a8939c90f0d5d7b1edd9f3f0af7 /app/controllers | |
| parent | 6ea674d1796488f784083eab53becb86330343cb (diff) | |
| parent | c6a4c9231e983f2bd5f0c2115a5c9c16fd18bfb2 (diff) | |
| download | gitlab-ce-59af98f133ee229479c6159b15391deb4782a294.tar.gz | |
Merge branch 'rails5-fix-utf' into 'master'
Use InvalidUTF8ErrorHandler only for rails 4
Closes #51908
See merge request gitlab-org/gitlab-ce!22340
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bbeaeb7694e..eeabcc0c9bb 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -12,7 +12,9 @@ class ApplicationController < ActionController::Base include WorkhorseHelper include EnforcesTwoFactorAuthentication include WithPerformanceBar - include InvalidUTF8ErrorHandler + # this can be removed after switching to rails 5 + # https://gitlab.com/gitlab-org/gitlab-ce/issues/51908 + include InvalidUTF8ErrorHandler unless Gitlab.rails5? before_action :authenticate_sessionless_user! before_action :authenticate_user! |