diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-06 12:09:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-06 12:09:20 +0300 |
| commit | c203c40cda9df83cc33f9d69a24593ef4de1148d (patch) | |
| tree | f13d457cff113e393e256132534296ec9e7ad2d7 /app/helpers/preferences_helper.rb | |
| parent | 2553d13d9064a16e98720b4d25add589b1e43e28 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/preferences_helper.rb')
| -rw-r--r-- | app/helpers/preferences_helper.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb index 7a0462e1b2c..271359fcfd1 100644 --- a/app/helpers/preferences_helper.rb +++ b/app/helpers/preferences_helper.rb @@ -70,7 +70,10 @@ module PreferencesHelper end def language_choices - Gitlab::I18n::AVAILABLE_LANGUAGES.map(&:reverse).sort + options_for_select( + Gitlab::I18n::AVAILABLE_LANGUAGES.map(&:reverse).sort, + current_user.preferred_language + ) end private |