Skip to content

Commit 6494467

Browse files
committed
Merge branch 'frozen-string-lib-gitlab-even-more' into 'master'
Enable even more frozen string in lib/gitlab See merge request gitlab-org/gitlab-ce!22959
2 parents 1d16530 + ebf98f2 commit 6494467

File tree

104 files changed

+237
-22
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+237
-22
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Enable even more frozen string in lib/gitlab/**/*.rb
3+
merge_request:
4+
author: gfyoung
5+
type: performance

lib/gitlab/fogbugz_import/client.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'fogbugz'
24

35
module Gitlab

lib/gitlab/fogbugz_import/importer.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module FogbugzImport
35
class Importer

lib/gitlab/fogbugz_import/project_creator.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module FogbugzImport
35
class ProjectCreator

lib/gitlab/fogbugz_import/repository.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module FogbugzImport
35
class Repository

lib/gitlab/gfm/reference_rewriter.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Gfm
35
##

lib/gitlab/gfm/uploads_rewriter.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'fileutils'
24

35
module Gitlab

lib/gitlab/git/attributes_at_ref_parser.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
# Parses root .gitattributes file at a given ref

lib/gitlab/git/attributes_parser.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
# Class for parsing Git attribute files and extracting the attributes for

lib/gitlab/git/blame.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class Blame

lib/gitlab/git/blob.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
# Gitaly note: JV: seems to be completely migrated (behind feature flags).
24

35
module Gitlab

lib/gitlab/git/branch.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class Branch < Ref

lib/gitlab/git/commit.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
# Gitlab::Git::Commit is a wrapper around Gitaly::GitCommit
24
module Gitlab
35
module Git

lib/gitlab/git/commit_stats.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
# Gitlab::Git::CommitStats counts the additions, deletions, and total changes
24
# in a commit.
35
module Gitlab

lib/gitlab/git/compare.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
# Gitaly note: JV: no RPC's here.
24

35
module Gitlab

lib/gitlab/git/conflict/file.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
module Conflict

lib/gitlab/git/conflict/parser.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
module Conflict

lib/gitlab/git/conflict/resolution.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
module Conflict

lib/gitlab/git/conflict/resolver.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
module Conflict

lib/gitlab/git/diff.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class Diff

lib/gitlab/git/diff_collection.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
# Gitaly note: JV: no RPC's here.
24

35
module Gitlab

lib/gitlab/git/gitmodules_parser.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
# Gitaly note: JV: no RPC's here.
24

35
module Gitlab

lib/gitlab/git/hook_env.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
# Gitaly note: JV: no RPC's here.
24

35
module Gitlab

lib/gitlab/git/index.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class Index

lib/gitlab/git/lfs_changes.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class LfsChanges

lib/gitlab/git/lfs_pointer_file.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class LfsPointerFile

lib/gitlab/git/operation_service.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class OperationService

lib/gitlab/git/path_helper.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
# Gitaly note: JV: no RPC's here.
24

35
module Gitlab

lib/gitlab/git/pre_receive_error.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
#

lib/gitlab/git/raw_diff_change.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
# This class behaves like a struct with fields :blob_id, :blob_size, :operation, :old_path, :new_path

lib/gitlab/git/ref.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class Ref

lib/gitlab/git/remote_mirror.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class RemoteMirror

lib/gitlab/git/remote_repository.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
#

lib/gitlab/git/repository.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require 'tempfile'
24
require 'forwardable'
35
require "rubygems/package"

lib/gitlab/git/repository_mirroring.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
module RepositoryMirroring

lib/gitlab/git/tag.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class Tag < Ref

lib/gitlab/git/tree.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class Tree

lib/gitlab/git/user.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class User

lib/gitlab/git/util.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
# Gitaly note: JV: no RPC's here.
24

35
module Gitlab

lib/gitlab/git/version.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
module Version

lib/gitlab/git/wiki.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class Wiki

lib/gitlab/git/wiki_file.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class WikiFile

lib/gitlab/git/wiki_page.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class WikiPage

lib/gitlab/git/wiki_page_version.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
class WikiPageVersion

lib/gitlab/git/wraps_gitaly_errors.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module Git
35
module WrapsGitalyErrors

lib/gitlab/gitaly_client/attributes_bag.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module GitalyClient
35
# This module expects an `ATTRS` const to be defined on the subclass

lib/gitlab/gitaly_client/blob_service.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module GitalyClient
35
class BlobService
@@ -15,7 +17,7 @@ def get_blob(oid:, limit:)
1517
)
1618
response = GitalyClient.call(@gitaly_repo.storage_name, :blob_service, :get_blob, request, timeout: GitalyClient.fast_timeout)
1719

18-
data = ''
20+
data = []
1921
blob = nil
2022
response.each do |msg|
2123
if blob.nil?
@@ -27,6 +29,8 @@ def get_blob(oid:, limit:)
2729

2830
return nil if blob.oid.blank?
2931

32+
data = data.join
33+
3034
Gitlab::Git::Blob.new(
3135
id: blob.oid,
3236
size: blob.size,

lib/gitlab/gitaly_client/blobs_stitcher.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module GitalyClient
35
class BlobsStitcher

lib/gitlab/gitaly_client/commit_service.rb

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module GitalyClient
35
class CommitService
@@ -93,7 +95,7 @@ def tree_entry(ref, path, limit = nil)
9395
response = GitalyClient.call(@repository.storage, :commit_service, :tree_entry, request, timeout: GitalyClient.medium_timeout)
9496

9597
entry = nil
96-
data = ''
98+
data = []
9799
response.each do |msg|
98100
if entry.nil?
99101
entry = msg
@@ -103,7 +105,7 @@ def tree_entry(ref, path, limit = nil)
103105

104106
data << msg.data
105107
end
106-
entry.data = data
108+
entry.data = data.join
107109

108110
entry unless entry.oid.blank?
109111
end
@@ -254,7 +256,7 @@ def raw_blame(revision, path)
254256
)
255257

256258
response = GitalyClient.call(@repository.storage, :commit_service, :raw_blame, request, timeout: GitalyClient.medium_timeout)
257-
response.reduce("") { |memo, msg| memo << msg.data }
259+
response.reduce([]) { |memo, msg| memo << msg.data }.join
258260
end
259261

260262
def find_commit(revision)
@@ -345,8 +347,8 @@ def extract_signature(commit_id)
345347
request = Gitaly::ExtractCommitSignatureRequest.new(repository: @gitaly_repo, commit_id: commit_id)
346348
response = GitalyClient.call(@repository.storage, :commit_service, :extract_commit_signature, request)
347349

348-
signature = ''.b
349-
signed_text = ''.b
350+
signature = +''.b
351+
signed_text = +''.b
350352

351353
response.each do |message|
352354
signature << message.signature
@@ -364,7 +366,7 @@ def get_commit_signatures(commit_ids)
364366
request = Gitaly::GetCommitSignaturesRequest.new(repository: @gitaly_repo, commit_ids: commit_ids)
365367
response = GitalyClient.call(@repository.storage, :commit_service, :get_commit_signatures, request, timeout: GitalyClient.fast_timeout)
366368

367-
signatures = Hash.new { |h, k| h[k] = [''.b, ''.b] }
369+
signatures = Hash.new { |h, k| h[k] = [+''.b, +''.b] }
368370
current_commit_id = nil
369371

370372
response.each do |message|
@@ -383,7 +385,7 @@ def get_commit_messages(commit_ids)
383385
request = Gitaly::GetCommitMessagesRequest.new(repository: @gitaly_repo, commit_ids: commit_ids)
384386
response = GitalyClient.call(@repository.storage, :commit_service, :get_commit_messages, request, timeout: GitalyClient.fast_timeout)
385387

386-
messages = Hash.new { |h, k| h[k] = ''.b }
388+
messages = Hash.new { |h, k| h[k] = +''.b }
387389
current_commit_id = nil
388390

389391
response.each do |rpc_message|

lib/gitlab/gitaly_client/conflict_files_stitcher.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module GitalyClient
35
class ConflictFilesStitcher
@@ -17,7 +19,7 @@ def each
1719

1820
current_file = file_from_gitaly_header(gitaly_file.header)
1921
else
20-
current_file.raw_content << gitaly_file.content
22+
current_file.raw_content = "#{current_file.raw_content}#{gitaly_file.content}"
2123
end
2224
end
2325
end

lib/gitlab/gitaly_client/conflicts_service.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module GitalyClient
35
class ConflictsService

lib/gitlab/gitaly_client/diff.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
module Gitlab
24
module GitalyClient
35
class Diff

0 commit comments

Comments
 (0)