Merge branch 'jej/backport-authorized-keys-to-ce-ee' into 'master'

EE changes after moving fast authorized_keys feature to CE

See merge request gitlab-org/gitlab-ee!3959

app/helpers/application_settings_helper.rb

@@ -147,6 +147,7 @@ module ApplicationSettingsHelper
       :after_sign_up_text,
       :akismet_api_key,
       :akismet_enabled,
+      :authorized_keys_enabled,
       :auto_devops_enabled,
       :circuitbreaker_access_retries,
       :circuitbreaker_check_interval,

app/models/application_setting.rb

@@ -274,6 +274,7 @@ class ApplicationSetting < ActiveRecord::Base
     {
       after_sign_up_text: nil,
       akismet_enabled: false,
+      authorized_keys_enabled: true, # TODO default to false if the instance is configured to use AuthorizedKeysCommand
       container_registry_token_expire_delay: 5,
       default_artifacts_expire_in: '30 days',
       default_branch_protection: Settings.gitlab['default_branch_protection'],

doc/administration/operations/index.md

@@ -15,4 +15,4 @@ that to prioritize important jobs.
 to restart Sidekiq.
 - **(EES/EEP)** [Extra Sidekiq operations](extra_sidekiq_processes.md): Configure an extra set of Sidekiq processes to ensure certain queues always have dedicated workers, no matter the amount of jobs that need to be processed.
 - [Unicorn](unicorn.md): Understand Unicorn and unicorn-worker-killer.
-- **(EES/EEP)** [Speed up SSH operations](fast_ssh_key_lookup.md): Authorize SSH users via a fast, indexed lookup to the GitLab database.
+- [Speed up SSH operations](fast_ssh_key_lookup.md): Authorize SSH users via a fast, indexed lookup to the GitLab database.

ee/app/helpers/ee/application_settings_helper.rb

@@ -4,7 +4,6 @@ module EE
       raise NotImplementedError unless defined?(super)
 
       super + [
-        :authorized_keys_enabled,
         :check_namespace_plan,
         :elasticsearch_aws,
         :elasticsearch_aws_access_key,

ee/app/models/ee/application_setting.rb

@@ -32,7 +32,6 @@ module EE
     module ClassMethods
       def defaults
         super.merge(
-          authorized_keys_enabled: true, # TODO default to false if the instance is configured to use AuthorizedKeysCommand
           elasticsearch_url: ENV['ELASTIC_URL'] || 'http://localhost:9200',
           elasticsearch_aws: false,
           elasticsearch_aws_region: ENV['ELASTIC_REGION'] || 'us-east-1',

spec/lib/gitlab/shell_spec.rb

@@ -69,7 +69,7 @@ describe Gitlab::Shell do
       end
 
       it 'does nothing' do
-        expect(Gitlab::Utils).not_to receive(:system_silent)
+        expect(gitlab_shell).not_to receive(:gitlab_shell_fast_execute)
 
         gitlab_shell.add_key('key-123', 'ssh-rsa foobar trailing garbage')
       end
@@ -443,7 +443,7 @@ describe Gitlab::Shell do
         end
       end
 
-      context 'with gitlay' do
+      context 'with gitaly' do
         it_behaves_like '#add_repository'
       end
 

spec/requests/api/internal_spec.rb

@@ -193,7 +193,7 @@ describe API::Internal do
   end
 
   describe "GET /internal/authorized_keys" do
-    context "unsing an existing key's fingerprint" do
+    context "using an existing key's fingerprint" do
       it "finds the key" do
         get(api('/internal/authorized_keys'), fingerprint: key.fingerprint, secret_token: secret_token)