Merge branch 'dm-api-current-user' into 'master'

Do not validate CSRF token in API unless needed Closes #35705 See merge request !13256

Merge branch 'dm-api-current-user' into 'master'
1018ab05 · Sean McGivern · f105a857 · 14644d40 · 1018ab05 · 1018ab05
Commit 1018ab05 authored Aug 03, 2017 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

api.rb lib/api/api.rb +1 -1

helpers.rb lib/api/helpers.rb +2 -0

No files found.
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -48,8 +48,8 @@ module API
    end

    before { header['X-Frame-Options'] = 'SAMEORIGIN' }
-    before { Gitlab::I18n.locale = current_user&.preferred_language }

+    # The locale is set to the current user's locale when `current_user` is loaded
    after { Gitlab::I18n.use_default_locale }

    rescue_from Gitlab::Access::AccessDeniedError do

--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -16,6 +16,8 @@ module API

      @current_user = initial_current_user

+      Gitlab::I18n.locale = @current_user&.preferred_language
+
      sudo!

      @current_user