satisfy rubocop

app/helpers/merge_requests_helper.rb

@@ -93,12 +93,11 @@ module MergeRequestsHelper
       more_approvals = merge_request.approvals_left - merge_request.approvers_left.count
       approvers_names = merge_request.approvers_left.map(&:name)
 
-      case true
-      when more_approvals > 0
+      if more_approvals > 0
         str << " (from #{render_items_list(approvers_names + ["#{more_approvals} more"])})"
-      when more_approvals < 0
+      elsif more_approvals < 0
         str << " (from #{render_items_list(approvers_names, "or")})"
-      else
+      elsif
         str << " (from #{render_items_list(approvers_names)})"
       end
     end

app/models/remote_mirror.rb

@@ -119,7 +119,7 @@ class RemoteMirror < ActiveRecord::Base
 
     result = URI.parse(url)
     result.password = '*****' if result.password
-    result.user = '*****' if result.user && result.user != "git" #tokens or other data may be saved as user
+    result.user = '*****' if result.user && result.user != "git" # tokens or other data may be saved as user
     result.to_s
   end
 

config/initializers/1_settings.rb

@@ -419,8 +419,8 @@ Settings.satellites['path'] = File.expand_path(Settings.satellites['path'] || "t
 #
 Settings['kerberos'] ||= Settingslogic.new({})
 Settings.kerberos['enabled'] = false if Settings.kerberos['enabled'].nil?
-Settings.kerberos['keytab'] = nil if Settings.kerberos['keytab'].blank? #nil means use default keytab
-Settings.kerberos['service_principal_name'] = nil if Settings.kerberos['service_principal_name'].blank? #nil means any SPN in keytab
+Settings.kerberos['keytab'] = nil if Settings.kerberos['keytab'].blank? # nil means use default keytab
+Settings.kerberos['service_principal_name'] = nil if Settings.kerberos['service_principal_name'].blank? # nil means any SPN in keytab
 Settings.kerberos['use_dedicated_port'] = false if Settings.kerberos['use_dedicated_port'].nil?
 Settings.kerberos['https'] = Settings.gitlab.https if Settings.kerberos['https'].nil?
 Settings.kerberos['port'] ||= Settings.kerberos.https ? 8443 : 8088

spec/requests/api/ldap_group_links_spec.rb

@@ -51,7 +51,7 @@ describe API::API, api: true  do
         expect(json_response['provider']).to eq('ldap3')
       end
 
-      #TODO: Correct and activate this test once issue #329 is fixed
+      # TODO: Correct and activate this test once issue #329 is fixed
       xit "should return ok and add ldap group link even if no provider specified" do
         expect do
           post api("/groups/#{group_with_ldap_links.id}/ldap_group_links", owner),