diff options
| author | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-05-26 19:18:07 +0000 |
|---|---|---|
| committer | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-05-26 19:18:07 +0000 |
| commit | b5e8de5c4c202d10ef8b48248b12f49c1330d04a (patch) | |
| tree | e034bee79723e84eab1e9257c3848d4c991d5333 /lib/api/api.rb | |
| parent | 8f44bc4dc10caf3c9856a8e4bea5ac145a315131 (diff) | |
| parent | 3605e4307ddf373071c0353a066c50fcead01e45 (diff) | |
| download | gitlab-ce-b5e8de5c4c202d10ef8b48248b12f49c1330d04a.tar.gz | |
Merge branch 'master' into '24196-protected-variables'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 52cd7cbe3db..ac113c5200d 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -45,9 +45,9 @@ module API end before { allow_access_with_scope :api } - before { Gitlab::I18n.set_locale(current_user) } + before { Gitlab::I18n.locale = current_user&.preferred_language } - after { Gitlab::I18n.reset_locale } + after { Gitlab::I18n.use_default_locale } rescue_from Gitlab::Access::AccessDeniedError do rack_response({ 'message' => '403 Forbidden' }.to_json, 403) |