From 60aae1cea2c10c9b4e99e949bc8a28a67c12115e Mon Sep 17 00:00:00 2001 From: Archish Thakkar <archishthakkar@gmail.com> Date: Sat, 28 Sep 2024 19:33:38 +0000 Subject: [PATCH] Lint issue fix in Layout/LineEndStringConcatenationIndentation 11 --- ...line_end_string_concatenation_indentation.yml | 6 ------ .../widgets/time_tracking/timelog_input_type.rb | 2 +- app/helpers/application_settings_helper.rb | 16 ++++++++-------- app/helpers/members_helper.rb | 2 +- app/helpers/projects/project_members_helper.rb | 6 +++--- app/helpers/storage_helper.rb | 4 ++-- 6 files changed, 15 insertions(+), 21 deletions(-) diff --git a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml index 5654e48bea5a3..c06e0b75a3f9d 100644 --- a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml +++ b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml @@ -63,12 +63,6 @@ Layout/LineEndStringConcatenationIndentation: - 'app/graphql/types/project_type.rb' - 'app/graphql/types/query_type.rb' - 'app/graphql/types/root_storage_statistics_type.rb' - - 'app/graphql/types/user_interface.rb' - - 'app/graphql/types/work_items/widgets/time_tracking/timelog_input_type.rb' - - 'app/helpers/application_settings_helper.rb' - - 'app/helpers/members_helper.rb' - - 'app/helpers/projects/project_members_helper.rb' - - 'app/helpers/storage_helper.rb' - 'app/helpers/tags_helper.rb' - 'app/helpers/tree_helper.rb' - 'app/helpers/visibility_level_helper.rb' diff --git a/app/graphql/types/work_items/widgets/time_tracking/timelog_input_type.rb b/app/graphql/types/work_items/widgets/time_tracking/timelog_input_type.rb index acf4aaed79a98..82589812b329e 100644 --- a/app/graphql/types/work_items/widgets/time_tracking/timelog_input_type.rb +++ b/app/graphql/types/work_items/widgets/time_tracking/timelog_input_type.rb @@ -14,7 +14,7 @@ class TimelogInputType < BaseInputObject argument :spent_at, Types::TimeType, required: false, description: 'Timestamp of when the time tracked was spent at, ' \ - 'if not provided would be set to current timestamp.' + 'if not provided would be set to current timestamp.' argument :summary, GraphQL::Types::String, required: false, diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 1ebff2a375f64..1ee886b4a7682 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -76,15 +76,15 @@ def restricted_level_checkboxes(form) restricted_visibility_levels_help_text = { Gitlab::VisibilityLevel::PUBLIC => s_( 'AdminSettings|If selected, only administrators are able to create public groups, projects, ' \ - 'and snippets. Also, profiles are only visible to authenticated users.' + 'and snippets. Also, profiles are only visible to authenticated users.' ), Gitlab::VisibilityLevel::INTERNAL => s_( 'AdminSettings|If selected, only administrators are able to create internal groups, projects, and ' \ - 'snippets.' + 'snippets.' ), Gitlab::VisibilityLevel::PRIVATE => s_( 'AdminSettings|If selected, only administrators are able to create private groups, projects, and ' \ - 'snippets.' + 'snippets.' ) } @@ -162,7 +162,7 @@ def repository_storages_options_json def external_authorization_description s_("ExternalAuthorization|Access to projects is validated on an external service "\ - "using their classification label.") + "using their classification label.") end def external_authorization_allow_token_help_text @@ -171,7 +171,7 @@ def external_authorization_allow_token_help_text def external_authorization_timeout_help_text s_("ExternalAuthorization|Period GitLab waits for a response from the external "\ - "service. If there is no response, access is denied. Default: 0.5 seconds.") + "service. If there is no response, access is denied. Default: 0.5 seconds.") end def external_authorization_url_help_text @@ -182,17 +182,17 @@ def external_authorization_url_help_text def external_authorization_client_certificate_help_text s_("ExternalAuthorization|Certificate used to authenticate with the external authorization service. "\ - "If blank, the server certificate is validated when accessing over HTTPS.") + "If blank, the server certificate is validated when accessing over HTTPS.") end def external_authorization_client_key_help_text s_("ExternalAuthorization|Private key of client authentication certificate. "\ - "Encrypted when stored.") + "Encrypted when stored.") end def external_authorization_client_pass_help_text s_("ExternalAuthorization|Passphrase required to decrypt the private key. "\ - "Encrypted when stored.") + "Encrypted when stored.") end def external_authorization_client_url_help_text diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index 600e5f06c6183..7e5e14291de42 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -32,7 +32,7 @@ def remove_member_message(member, user: nil) def leave_confirmation_message(member_source) "Are you sure you want to leave the " \ - "\"#{member_source.human_name}\" #{member_source.model_name.to_s.humanize(capitalize: false)}?" + "\"#{member_source.human_name}\" #{member_source.model_name.to_s.humanize(capitalize: false)}?" end def member_path(member) diff --git a/app/helpers/projects/project_members_helper.rb b/app/helpers/projects/project_members_helper.rb index 8909edab055a3..d9bb03c218537 100644 --- a/app/helpers/projects/project_members_helper.rb +++ b/app/helpers/projects/project_members_helper.rb @@ -10,9 +10,9 @@ def project_member_header_subtext(project) share_project_description(project) else ERB::Util.html_escape(_("Members can be added by project " \ - "%{i_open}Maintainers%{i_close} or %{i_open}Owners%{i_close}")) % { - i_open: '<i>'.html_safe, i_close: '</i>'.html_safe - } + "%{i_open}Maintainers%{i_close} or %{i_open}Owners%{i_close}")) % { + i_open: '<i>'.html_safe, i_close: '</i>'.html_safe + } end end diff --git a/app/helpers/storage_helper.rb b/app/helpers/storage_helper.rb index 669d13c14c286..ea8ee023c53bf 100644 --- a/app/helpers/storage_helper.rb +++ b/app/helpers/storage_helper.rb @@ -23,8 +23,8 @@ def storage_counters_details(statistics) _( "Repository: %{counter_repositories} / Wikis: %{counter_wikis} / Build Artifacts: %{counter_build_artifacts} / " \ - "Pipeline Artifacts: %{counter_pipeline_artifacts} / LFS: %{counter_lfs_objects} / " \ - "Snippets: %{counter_snippets} / Packages: %{counter_packages} / Uploads: %{counter_uploads}" + "Pipeline Artifacts: %{counter_pipeline_artifacts} / LFS: %{counter_lfs_objects} / " \ + "Snippets: %{counter_snippets} / Packages: %{counter_packages} / Uploads: %{counter_uploads}" ) % counters end end -- GitLab