Merge branch 'rs-trailingwhitespace-cop' into 'master'

.rubocop.yml

@@ -251,6 +251,10 @@ Layout/Tab:
 Layout/TrailingBlankLines:
   Enabled: true
 
+# Avoid trailing whitespace.
+Layout/TrailingWhitespace:
+  Enabled: true
+
 # Style #######################################################################
 
 # Check the naming of accessor methods for get_/set_.

.rubocop_todo.yml

@@ -57,11 +57,6 @@ Layout/SpaceInsideParens:
 Layout/SpaceInsidePercentLiteralDelimiters:
   Enabled: false
 
-# Offense count: 89
-# Cop supports --auto-correct.
-Layout/TrailingWhitespace:
-  Enabled: false
-
 # Offense count: 272
 RSpec/EmptyLineAfterFinalLet:
   Enabled: false

app/controllers/groups/application_controller.rb

@@ -34,7 +34,7 @@ class Groups::ApplicationController < ApplicationController
 
   def build_canonical_path(group)
     params[:group_id] = group.to_param
-    
+
     url_for(params)
   end
 end

app/controllers/omniauth_callbacks_controller.rb

@@ -142,13 +142,13 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def oauth
     @oauth ||= request.env['omniauth.auth']
   end
-  
+
   def fail_login
     error_message = @user.errors.full_messages.to_sentence
 
     return redirect_to omniauth_error_path(oauth['provider'], error: error_message)
   end
-  
+
   def fail_ldap_login
     flash[:alert] = 'Access denied for your LDAP account.'
 

app/controllers/projects/cycle_analytics/events_controller.rb

@@ -2,7 +2,7 @@ module Projects
   module CycleAnalytics
     class EventsController < Projects::ApplicationController
       include CycleAnalyticsParams
-    
+
       before_action :authorize_read_cycle_analytics!
       before_action :authorize_read_build!, only: [:test, :staging]
       before_action :authorize_read_issue!, only: [:issue, :production]
@@ -11,33 +11,33 @@ module Projects
       def issue
         render_events(cycle_analytics[:issue].events)
       end
-    
+
       def plan
         render_events(cycle_analytics[:plan].events)
       end
-    
+
       def code
         render_events(cycle_analytics[:code].events)
       end
-    
+
       def test
         options(events_params)[:branch] = events_params[:branch_name]
-    
+
         render_events(cycle_analytics[:test].events)
       end
-    
+
       def review
         render_events(cycle_analytics[:review].events)
       end
-    
+
       def staging
         render_events(cycle_analytics[:staging].events)
       end
-    
+
       def production
         render_events(cycle_analytics[:production].events)
       end
-    
+
       private
 
       def render_events(events)
@@ -46,14 +46,14 @@ module Projects
           format.json { render json: { events: events } }
         end
       end
-    
+
       def cycle_analytics
         @cycle_analytics ||= ::CycleAnalytics.new(project, options(events_params))
       end
-    
+
       def events_params
         return {} unless params[:events].present?
-    
+
         params[:events].permit(:start_date, :branch_name)
       end
     end

app/controllers/projects/merge_requests_controller.rb

@@ -218,8 +218,8 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
             if can?(current_user, :read_environment, environment) && environment.has_metrics?
               metrics_project_environment_deployment_path(environment.project, environment, deployment)
             end
-          
-          metrics_monitoring_url = 
+
+          metrics_monitoring_url =
             if can?(current_user, :read_environment, environment)
               environment_metrics_path(environment)
             end

app/helpers/pipeline_schedules_helper.rb

 module PipelineSchedulesHelper
   def timezone_data
-    ActiveSupport::TimeZone.all.map do |timezone| 
-      { 
-        name: timezone.name, 
-        offset: timezone.utc_offset, 
-        identifier: timezone.tzinfo.identifier 
+    ActiveSupport::TimeZone.all.map do |timezone|
+      {
+        name: timezone.name,
+        offset: timezone.utc_offset,
+        identifier: timezone.tzinfo.identifier
       }
     end
   end

app/models/blob_viewer/notebook.rb

@@ -2,7 +2,7 @@ module BlobViewer
   class Notebook < Base
     include Rich
     include ClientSide
-    
+
     self.partial_name = 'notebook'
     self.extensions = %w(ipynb)
     self.binary = false

app/models/deploy_keys_project.rb

@@ -12,7 +12,7 @@ class DeployKeysProject < ActiveRecord::Base
 
   def destroy_orphaned_deploy_key
     return unless self.deploy_key.destroyed_when_orphaned? && self.deploy_key.orphaned?
-    
+
     self.deploy_key.destroy
   end
 end

app/models/redirect_route.rb

@@ -14,7 +14,7 @@ class RedirectRoute < ActiveRecord::Base
              else
                'redirect_routes.path = ? OR redirect_routes.path LIKE ?'
              end
-             
+
     where(wheres, path, "#{sanitize_sql_like(path)}/%")
   end
 end

app/serializers/project_entity.rb

 class ProjectEntity < Grape::Entity
   include RequestAwareEntity
-  
+
   expose :id
   expose :name
 

config/initializers/0_acts_as_taggable.rb

@@ -5,5 +5,5 @@ ActsAsTaggableOn.strict_case_match = true
 ActsAsTaggableOn.tags_counter = false
 
 # validate that counter cache is disabled
-raise "Counter cache is not disabled" if 
+raise "Counter cache is not disabled" if
     ActsAsTaggableOn::Tagging.reflections["tag"].options[:counter_cache]

config/initializers/static_files.rb

 app = Rails.application
 
 if app.config.serve_static_files
-  # The `ActionDispatch::Static` middleware intercepts requests for static files 
-  # by checking if they exist in the `/public` directory. 
+  # The `ActionDispatch::Static` middleware intercepts requests for static files
+  # by checking if they exist in the `/public` directory.
   # We're replacing it with our `Gitlab::Middleware::Static` that does the same,
   # except ignoring `/uploads`, letting those go through to the GitLab Rails app.
 
   app.config.middleware.swap(
-    ActionDispatch::Static, 
-    Gitlab::Middleware::Static, 
-    app.paths["public"].first, 
+    ActionDispatch::Static,
+    Gitlab::Middleware::Static,
+    app.paths["public"].first,
     app.config.static_cache_control
   )
 

config/initializers/trusted_proxies.rb

@@ -2,7 +2,7 @@
 # as the ActionDispatch::Request object. This is necessary for libraries
 # like rack_attack where they don't use ActionDispatch, and we want them
 # to block/throttle requests on private networks.
-# Rack Attack specific issue: https://github.com/kickstarter/rack-attack/issues/145 
+# Rack Attack specific issue: https://github.com/kickstarter/rack-attack/issues/145
 module Rack
   class Request
     def trusted_proxy?(ip)

config/routes/repository.rb

@@ -3,7 +3,7 @@
 resource :repository, only: [:create] do
   member do
     get ':ref/archive', constraints: { format: Gitlab::PathRegex.archive_formats_regex, ref: /.+/ }, action: 'archive', as: 'archive'
-    
+
     # deprecated since GitLab 9.5
     get 'archive', constraints: { format: Gitlab::PathRegex.archive_formats_regex }, as: 'archive_alternative'
   end

db/migrate/20161020075830_default_request_access_projects.rb

 class DefaultRequestAccessProjects < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
   DOWNTIME = false
-  
+
   def up
     change_column_default :projects, :request_access_enabled, false
   end

db/post_migrate/20170503004427_update_retried_for_ci_build.rb

@@ -21,7 +21,7 @@ class UpdateRetriedForCiBuild < ActiveRecord::Migration
   private
 
   def up_mysql
-    # This is a trick to overcome MySQL limitation: 
+    # This is a trick to overcome MySQL limitation:
     # Mysql2::Error: Table 'ci_builds' is specified twice, both as a target for 'UPDATE' and as a separate source for data
     # However, this leads to create a temporary table from `max(ci_builds.id)` which is slow and do full database update
     execute <<-SQL.strip_heredoc

db/post_migrate/20170523083112_migrate_old_artifacts.rb

@@ -7,7 +7,7 @@ class MigrateOldArtifacts < ActiveRecord::Migration
 
   # This uses special heuristic to find potential candidates for data migration
   # Read more about this here: https://gitlab.com/gitlab-org/gitlab-ce/issues/32036#note_30422345
-  
+
   def up
     builds_with_artifacts.find_each do |build|
       build.migrate_artifacts!
@@ -51,14 +51,14 @@ class MigrateOldArtifacts < ActiveRecord::Migration
     private
 
     def source_artifacts_path
-      @source_artifacts_path ||= 
+      @source_artifacts_path ||=
         File.join(Gitlab.config.artifacts.path,
           created_at.utc.strftime('%Y_%m'),
           ci_id.to_s, id.to_s)
     end
 
     def target_artifacts_path
-      @target_artifacts_path ||= 
+      @target_artifacts_path ||=
         File.join(Gitlab.config.artifacts.path,
           created_at.utc.strftime('%Y_%m'),
           project_id.to_s, id.to_s)

features/steps/profile/emails.rb

@@ -28,7 +28,7 @@ class Spinach::Features::ProfileEmails < Spinach::FeatureSteps
     expect(email).to be_nil
     expect(page).not_to have_content("my@email.com")
   end
-  
+
   step 'I click link "Remove" for "my@email.com"' do
     # there should only be one remove button at this time
     click_link "Remove"

lib/api/entities.rb

@@ -83,7 +83,7 @@ module API
       expose :created_at, :last_activity_at
     end
 
-    class Project < BasicProjectDetails 
+    class Project < BasicProjectDetails
       include ::API::Helpers::RelatedResourcesHelpers
 
       expose :_links do

lib/api/protected_branches.rb

@@ -61,7 +61,7 @@ module API
         service_args = [user_project, current_user, protected_branch_params]
 
         protected_branch = ::ProtectedBranches::CreateService.new(*service_args).execute
-        
+
         if protected_branch.persisted?
           present protected_branch, with: Entities::ProtectedBranch, project: user_project
         else

lib/banzai/filter/image_lazy_load_filter.rb

@@ -6,9 +6,9 @@ module Banzai
         doc.xpath('descendant-or-self::img').each do |img|
           img['class'] ||= '' << 'lazy'
           img['data-src'] = img['src']
-          img['src'] = LazyImageTagHelper.placeholder_image          
+          img['src'] = LazyImageTagHelper.placeholder_image
         end
-        
+
         doc
       end
     end

lib/constraints/project_url_constrainer.rb

@@ -7,7 +7,7 @@ class ProjectUrlConstrainer
     return false unless DynamicPathValidator.valid_project_path?(full_path)
 
     # We intentionally allow SELECT(*) here so result of this query can be used
-    # as cache for further Project.find_by_full_path calls within request 
+    # as cache for further Project.find_by_full_path calls within request
     Project.find_by_full_path(full_path, follow_redirects: request.get?).present?
   end
 end

lib/declarative_policy/base.rb

@@ -221,7 +221,7 @@ module DeclarativePolicy
     end
 
     # computes the given ability and prints a helpful debugging output
-    # showing which 
+    # showing which
     def debug(ability, *a)
       runner(ability).debug(*a)
     end

lib/gitlab/auth/ip_rate_limiter.rb

@@ -11,11 +11,11 @@ module Gitlab
       def enabled?
         config.enabled
       end
-      
+
       def reset!
         Rack::Attack::Allow2Ban.reset(ip, config)
       end
-      
+
       def register_fail!
         # Allow2Ban.filter will return false if this IP has not failed too often yet
         @banned = Rack::Attack::Allow2Ban.filter(ip, config) do
@@ -23,17 +23,17 @@ module Gitlab
           ip_can_be_banned?
         end
       end
-      
+
       def banned?
         @banned
       end
-      
+
       private
-      
+
       def config
         Gitlab.config.rack_attack.git_basic_auth
       end
-      
+
       def ip_can_be_banned?
         config.ip_whitelist.exclude?(ip)
       end

lib/gitlab/ci/build/artifacts/metadata.rb

@@ -60,7 +60,7 @@ module Gitlab
               begin
                 path = read_string(gz).force_encoding('UTF-8')
                 meta = read_string(gz).force_encoding('UTF-8')
-               
+
                 next unless path.valid_encoding? && meta.valid_encoding?
                 next unless path =~ match_pattern
                 next if path =~ INVALID_PATH_PATTERN

lib/gitlab/git/blob.rb

@@ -54,7 +54,7 @@ module Gitlab
         # [[commit_sha, path], [commit_sha, path], ...]. If blob_size_limit < 0 then the
         # full blob contents are returned. If blob_size_limit >= 0 then each blob will
         # contain no more than limit bytes in its data attribute.
-        # 
+        #
         # Keep in mind that this method may allocate a lot of memory. It is up
         # to the caller to limit the number of blobs and blob_size_limit.
         #

lib/gitlab/import_export/attributes_finder.rb

 module Gitlab
   module ImportExport
     class AttributesFinder
-    
       def initialize(included_attributes:, excluded_attributes:, methods:)
         @included_attributes = included_attributes || {}
         @excluded_attributes = excluded_attributes || {}

lib/gitlab/ldap/auth_hash.rb

@@ -17,7 +17,7 @@ module Gitlab
           value = value.first if value
           break if value.present?
         end
-        
+
         return super unless value
 
         Gitlab::Utils.force_utf8(value)

lib/gitlab/middleware/rails_queue_duration.rb

@@ -8,7 +8,7 @@ module Gitlab
       def initialize(app)
         @app = app
       end
-      
+
       def call(env)
         trans = Gitlab::Metrics.current_transaction
         proxy_start = env['HTTP_GITLAB_WORKHORSE_PROXY_START'].presence

lib/gitlab/slash_commands/presenters/help.rb

@@ -14,7 +14,7 @@ module Gitlab
           if text.start_with?('help')
             header_with_list("Available commands", full_commands(trigger))
           else
-            header_with_list("Unknown command, these commands are available", full_commands(trigger)) 
+            header_with_list("Unknown command, these commands are available", full_commands(trigger))
           end
         end
 

lib/tasks/gitlab/gitaly.rake

@@ -18,7 +18,7 @@ namespace :gitlab do
       command = status.zero? ? ['gmake'] : ['make']
 
       if Rails.env.test?
-        command += %W[BUNDLE_PATH=#{Bundler.bundle_path}] 
+        command += %W[BUNDLE_PATH=#{Bundler.bundle_path}]
       end
 
       Dir.chdir(args.dir) do

spec/features/admin/admin_settings_spec.rb

@@ -74,7 +74,7 @@ feature 'Admin updates settings' do
   context 'sign-in restrictions', :js do
     it 'de-activates oauth sign-in source' do
       find('.btn', text: 'GitLab.com').click
-      
+
       expect(find('.btn', text: 'GitLab.com')).not_to have_css('.active')
     end
   end

spec/features/issues_spec.rb

@@ -708,7 +708,7 @@ describe 'Issues' do
   end
 
   describe 'confidential issue#show', js: true do
-    it 'shows confidential sibebar information as confidential and can be turned off' do 
+    it 'shows confidential sibebar information as confidential and can be turned off' do
       issue = create(:issue, :confidential, project: project)
 
       visit project_issue_path(project, issue)

spec/features/milestones/show_spec.rb

@@ -8,7 +8,7 @@ describe 'Milestone show' do
   let(:issue_params) { { project: project, assignees: [user], author: user, milestone: milestone, labels: labels } }
 
   before do
-    project.add_user(user, :developer) 
+    project.add_user(user, :developer)
     sign_in(user)
   end
 

spec/features/projects/files/undo_template_spec.rb

@@ -20,7 +20,7 @@ feature 'Template Undo Button', js: true do
     end
   end
 
-  context 'creating a non-matching file' do 
+  context 'creating a non-matching file' do
     before do
       visit project_new_blob_path(project, 'master')
       select_file_template_type('LICENSE')

spec/javascripts/fixtures/prometheus_service.rb

@@ -7,7 +7,7 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle
   let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
   let(:project)   { create(:project_empty_repo, namespace: namespace, path: 'services-project') }
   let!(:service)  { create(:prometheus_service, project: project) }
-  
+
   render_views
 
   before(:all) do

spec/javascripts/fixtures/services.rb

@@ -7,7 +7,6 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle
   let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
   let(:project)   { create(:project_empty_repo, namespace: namespace, path: 'services-project') }
   let!(:service)  { create(:custom_issue_tracker_service, project: project, title: 'Custom Issue Tracker') }
-  
 
   render_views
 

spec/lib/gitlab/ci/trace/stream_spec.rb

@@ -295,7 +295,7 @@ describe Gitlab::Ci::Trace::Stream do
     end
 
     context 'malicious regexp' do
-      let(:data) { malicious_text }  
+      let(:data) { malicious_text }
       let(:regex) { malicious_regexp }
 
       include_examples 'malicious regexp'

spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb

@@ -6,10 +6,10 @@ describe Gitlab::CycleAnalytics::BaseEventFetcher do
   let(:user) { create(:user, :admin) }
   let(:start_time_attrs) { Issue.arel_table[:created_at] }
   let(:end_time_attrs) { [Issue::Metrics.arel_table[:first_associated_with_milestone_at]] }
-  let(:options) do 
+  let(:options) do
     { start_time_attrs: start_time_attrs,
       end_time_attrs: end_time_attrs,
-      from: 30.days.ago } 
+      from: 30.days.ago }
   end
 
   subject do

spec/lib/gitlab/key_fingerprint_spec.rb

@@ -30,8 +30,8 @@ describe Gitlab::KeyFingerprint, lib: true do
 
   MD5_FINGERPRINTS = {
     rsa: '06:b2:8a:92:df:0e:11:2c:ca:7b:8f:a4:ba:6e:4b:fd',
-    ecdsa: '45:ff:5b:98:9a:b6:8a:41:13:c1:30:8b:09:5e:7b:4e', 
-    ed25519: '2e:65:6a:c8:cf:bf:b2:8b:9a:bd:6d:9f:11:5c:12:16', 
+    ecdsa: '45:ff:5b:98:9a:b6:8a:41:13:c1:30:8b:09:5e:7b:4e',
+    ed25519: '2e:65:6a:c8:cf:bf:b2:8b:9a:bd:6d:9f:11:5c:12:16',
     dss: '57:98:86:02:5f:9c:f4:9b:ad:5a:1e:51:92:0e:fd:2b'
   }.freeze
 

spec/lib/gitlab/ldap/auth_hash_spec.rb

@@ -4,8 +4,8 @@ describe Gitlab::LDAP::AuthHash do
   let(:auth_hash) do
     described_class.new(
       OmniAuth::AuthHash.new(
-        uid: '123456', 
-        provider: 'ldapmain', 
+        uid: '123456',
+        provider: 'ldapmain',
         info: info,
         extra: {
           raw_info: raw_info
@@ -33,11 +33,11 @@ describe Gitlab::LDAP::AuthHash do
 
   context "without overridden attributes" do
     it "has the correct username" do
-      expect(auth_hash.username).to eq("123456") 
+      expect(auth_hash.username).to eq("123456")
     end
 
     it "has the correct name" do
-      expect(auth_hash.name).to eq("Smith, J.") 
+      expect(auth_hash.name).to eq("Smith, J.")
     end
   end
 
@@ -54,11 +54,11 @@ describe Gitlab::LDAP::AuthHash do
     end
 
     it "has the correct username" do
-      expect(auth_hash.username).to eq("johnsmith@example.com") 
+      expect(auth_hash.username).to eq("johnsmith@example.com")
     end
 
     it "has the correct name" do
-      expect(auth_hash.name).to eq("John Smith") 
+      expect(auth_hash.name).to eq("John Smith")
     end
   end
 end

spec/lib/gitlab/o_auth/user_spec.rb

@@ -481,7 +481,7 @@ describe Gitlab::OAuth::User do
           email: 'admin@othermail.com'
         }
       end
-      
+
       it 'generates the username with a counter' do
         expect(gl_user.username).to eq('admin1')
       end

spec/lib/gitlab/prometheus/additional_metrics_parser_spec.rb

@@ -24,7 +24,7 @@ describe Gitlab::Prometheus::AdditionalMetricsParser do
                 queries: [{ query_range: 'query_range_empty' }]
           - group: group_b
             priority: 1
-            metrics: 
+            metrics:
               - title: title
                 required_metrics: ['metric_a']
                 weight: 1
@@ -148,7 +148,7 @@ describe Gitlab::Prometheus::AdditionalMetricsParser do
             - group: group_a
               priority: 1
               metrics:
-              - title: 
+              - title:
                 required_metrics: []
                 weight: 1
                 queries: []

spec/migrations/migrate_old_artifacts_spec.rb

@@ -10,7 +10,7 @@ describe MigrateOldArtifacts do
   before do
     allow(Gitlab.config.artifacts).to receive(:path).and_return(directory)
   end
-  
+
   after do
     FileUtils.remove_entry_secure(directory)
   end
@@ -95,7 +95,7 @@ describe MigrateOldArtifacts do
       FileUtils.copy(
         Rails.root.join('spec/fixtures/ci_build_artifacts.zip'),
         File.join(legacy_path(build), "ci_build_artifacts.zip"))
-  
+
       FileUtils.copy(
         Rails.root.join('spec/fixtures/ci_build_artifacts_metadata.gz'),
         File.join(legacy_path(build), "ci_build_artifacts_metadata.gz"))

spec/requests/api/protected_branches_spec.rb

@@ -96,7 +96,7 @@ describe API::ProtectedBranches do
   describe 'POST /projects/:id/protected_branches' do
     let(:branch_name) { 'new_branch' }
 
-    context 'when authenticated as a master' do 
+    context 'when authenticated as a master' do
       before do
         project.add_master(user)
       end
@@ -221,7 +221,7 @@ describe API::ProtectedBranches do
 
     context 'when branch has a wildcard in its name' do
       let(:protected_name) { 'feature*' }
-      
+
       it "unprotects a wildcard branch" do
         delete api("/projects/#{project.id}/protected_branches/#{branch_name}", user)
 

spec/requests/api/settings_spec.rb

@@ -45,7 +45,7 @@ describe API::Settings, 'Settings' do
           help_page_hide_commercial_content: true,
           help_page_support_url: 'http://example.com/help',
           project_export_enabled: false
-          
+
         expect(response).to have_http_status(200)
         expect(json_response['default_projects_limit']).to eq(3)
         expect(json_response['password_authentication_enabled']).to be_falsey

spec/requests/ci/api/builds_spec.rb

@@ -130,7 +130,7 @@ describe Ci::API::Builds do
           register_builds info: { platform: :darwin }
 
           expect(response).to have_http_status(201)
-      
+
           expect(json_response["options"]).to be_empty
         end
       end

spec/services/web_hook_service_spec.rb

@@ -144,7 +144,7 @@ describe WebHookService do
 
   describe '#async_execute' do
     let(:system_hook) { create(:system_hook) }
-    
+
     it 'enqueue WebHookWorker' do
       expect(Sidekiq::Client).to receive(:enqueue).with(WebHookWorker, project_hook.id, data, 'push_hooks')
 

spec/support/generate-seed-repo-rb

 #!/usr/bin/env ruby
-# 
+#
 # # generate-seed-repo-rb
-# 
+#
 # This script generates the seed_repo.rb file used by lib/gitlab/git
 # tests. The seed_repo.rb file needs to be updated anytime there is a
 # Git push to https://gitlab.com/gitlab-org/gitlab-git-test.
-# 
+#
 # Usage:
-# 
+#
 #   ./spec/support/generate-seed-repo-rb > spec/support/seed_repo.rb
-# 
-# 
+#
+#
 
 require 'erb'
 require 'tempfile'

spec/support/matchers/access_matchers_for_controller.rb

 # AccessMatchersForController
 #
-# For testing authorize_xxx in controller. 
+# For testing authorize_xxx in controller.
 module AccessMatchersForController
   extend RSpec::Matchers::DSL
   include Warden::Test::Helpers

spec/tasks/gitlab/gitaly_rake_spec.rb

@@ -89,7 +89,7 @@ describe 'gitlab:gitaly namespace rake task' do
 
           it 'calls make in the gitaly directory without BUNDLE_PATH' do
             expect(main_object).to receive(:run_command!).with(command_preamble + ['make']).and_return(true)
-  
+
             run_rake_task('gitlab:gitaly:install', clone_path)
           end
         end