Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 9 deletions

diff --git a/lib/gitlab/visibility_level.rb b/lib/gitlab/visibility_level.rb
index 76cf769d041..abfb7e2310e 100644
--- a/lib/gitlab/visibility_level.rb
+++ b/lib/gitlab/visibility_level.rb
@@ -44,9 +44,9 @@ module Gitlab
 
       def options
         {
-          N_('VisibilityLevel|Private')  => PRIVATE,
-          N_('VisibilityLevel|Internal') => INTERNAL,
-          N_('VisibilityLevel|Public')   => PUBLIC
+          s_('VisibilityLevel|Private')  => PRIVATE,
+          s_('VisibilityLevel|Internal') => INTERNAL,
+          s_('VisibilityLevel|Public')   => PUBLIC
         }
       end
 
@@ -104,12 +104,7 @@ module Gitlab
       end
 
       def level_name(level)
-        level_name = N_('VisibilityLevel|Unknown')
-        options.each do |name, lvl|
-          level_name = name if lvl == level.to_i
-        end
-
-        s_(level_name)
+        options.key(level.to_i) || s_('VisibilityLevel|Unknown')
       end
 
       def level_value(level)