Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 7 deletions

diff --git a/spec/requests/api/settings_spec.rb b/spec/requests/api/settings_spec.rb
index 95d64ee8124..07e7a48d8c4 100644
--- a/spec/requests/api/settings_spec.rb
+++ b/spec/requests/api/settings_spec.rb
@@ -60,14 +60,14 @@ describe API::Settings, 'Settings' do
             default_projects_limit: 3,
             default_project_creation: 2,
             password_authentication_enabled_for_web: false,
-            repository_storages: 'custom',
+            repository_storages: ['custom'],
             plantuml_enabled: true,
             plantuml_url: 'http://plantuml.example.com',
             sourcegraph_enabled: true,
             sourcegraph_url: 'https://sourcegraph.com',
             sourcegraph_public_only: false,
             default_snippet_visibility: 'internal',
-            restricted_visibility_levels: 'public',
+            restricted_visibility_levels: ['public'],
             default_artifacts_expire_in: '2 days',
             help_page_text: 'custom help text',
             help_page_hide_commercial_content: true,
@@ -89,9 +89,7 @@ describe API::Settings, 'Settings' do
             push_event_hooks_limit: 2,
             push_event_activities_limit: 2,
             snippet_size_limit: 5,
-            issues_create_limit: 300,
-            disabled_oauth_sign_in_sources: 'unknown',
-            import_sources: 'github,bitbucket'
+            issues_create_limit: 300
           }
 
         expect(response).to have_gitlab_http_status(:ok)
@@ -129,8 +127,6 @@ describe API::Settings, 'Settings' do
         expect(json_response['push_event_activities_limit']).to eq(2)
         expect(json_response['snippet_size_limit']).to eq(5)
         expect(json_response['issues_create_limit']).to eq(300)
-        expect(json_response['disabled_oauth_sign_in_sources']).to eq([])
-        expect(json_response['import_sources']).to match_array(%w(github bitbucket))
       end
     end