Merge branch 'visibility-fix' into 'master'

Visibility fix

Fixes #1529

See merge request !1049

lib/gitlab/visibility_level.rb

@@ -23,7 +23,21 @@ module Gitlab
       end
 
       def allowed_for?(user, level)
-        user.is_admin? || !Gitlab.config.gitlab.restricted_visibility_levels.include?(level)
+        user.is_admin? || allowed_level?(level)
+      end
+
+      # Level can be a string `"public"` or a value `20`, first check if valid,
+      # then check if the corresponding string appears in the config
+      def allowed_level?(level)
+        if options.has_key?(level.to_s)
+          non_restricted_level?(level)
+        elsif options.has_value?(level.to_i)
+          non_restricted_level?(options.key(level.to_i).downcase)
+        end
+      end
+
+      def non_restricted_level?(level)
+        ! Gitlab.config.gitlab.restricted_visibility_levels.include?(level)
       end
     end
 

spec/services/projects/update_service_spec.rb

@@ -48,7 +48,7 @@ describe Projects::UpdateService do
     context 'respect configured visibility restrictions setting' do
       before(:each) do
         @restrictions = double("restrictions")
-        @restrictions.stub(:restricted_visibility_levels) { [ Gitlab::VisibilityLevel::PUBLIC ] }
+        @restrictions.stub(:restricted_visibility_levels) { [ "public" ] }
         Settings.stub_chain(:gitlab).and_return(@restrictions)
       end