Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAhmad Sherif <me@ahmadsherif.com>2017-08-29 10:15:36 +0300
committerAhmad Sherif <me@ahmadsherif.com>2017-08-31 12:37:08 +0300
commit8882d4e499de460a4530bca766a7c0540fd747b0 (patch)
tree90e0da256096d3d785f304036a5e30734e2c9376
parent3bf083a650248d06de5d418046a9873e206dc2bc (diff)
Use String#b instead of using a #bytes! method
-rw-r--r--ruby/lib/gitaly_server/ref_service.rb2
-rw-r--r--ruby/lib/gitaly_server/utils.rb8
2 files changed, 3 insertions, 7 deletions
diff --git a/ruby/lib/gitaly_server/ref_service.rb b/ruby/lib/gitaly_server/ref_service.rb
index 9d0cca04e..158a7f803 100644
--- a/ruby/lib/gitaly_server/ref_service.rb
+++ b/ruby/lib/gitaly_server/ref_service.rb
@@ -13,7 +13,7 @@ module GitalyServer
Gitaly::CreateBranchResponse.new(
status: :OK,
branch: Gitaly::Branch.new(
- name: bytes!(rugged_ref.name),
+ name: rugged_ref.name.b,
target_commit: gitaly_commit_from_rugged(rugged_ref.target),
),
)
diff --git a/ruby/lib/gitaly_server/utils.rb b/ruby/lib/gitaly_server/utils.rb
index ffc08107c..c5d5479cf 100644
--- a/ruby/lib/gitaly_server/utils.rb
+++ b/ruby/lib/gitaly_server/utils.rb
@@ -13,14 +13,10 @@ module GitalyServer
def gitaly_commit_author_from_rugged(rugged_author)
Gitaly::CommitAuthor.new(
- name: bytes!(rugged_author[:name]),
- email: bytes!(rugged_author[:email]),
+ name: rugged_author[:name].b,
+ email: rugged_author[:email].b,
date: Google::Protobuf::Timestamp.new(seconds: rugged_author[:time].to_i)
)
end
-
- def bytes!(string)
- string.force_encoding('ASCII-8BIT')
- end
end
end