diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-22 16:54:59 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:33:19 -0600 |
| commit | 56de781a2cef437b6e1af748dc0c231af74e044d (patch) | |
| tree | c8186a283904e3cc7461c4289cd2e1a8a9daa69c /lib/gitlab/git | |
| parent | 1fe7501b49f896b74102c4b970310aa9ae34da85 (diff) | |
| download | gitlab-ce-56de781a2cef437b6e1af748dc0c231af74e044d.tar.gz | |
Revert "Enable Style/DotPosition"
This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9.
# Conflicts:
# .rubocop.yml
# .rubocop_todo.yml
# lib/gitlab/ci/config/entry/global.rb
# lib/gitlab/ci/config/entry/jobs.rb
# spec/lib/gitlab/ci/config/entry/factory_spec.rb
# spec/lib/gitlab/ci/config/entry/global_spec.rb
# spec/lib/gitlab/ci/config/entry/job_spec.rb
# spec/lib/gitlab/ci/status/build/factory_spec.rb
# spec/lib/gitlab/incoming_email_spec.rb
Diffstat (limited to 'lib/gitlab/git')
| -rw-r--r-- | lib/gitlab/git/encoding_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/git/encoding_helper.rb b/lib/gitlab/git/encoding_helper.rb index 874fd8fe6e2..e57d228e688 100644 --- a/lib/gitlab/git/encoding_helper.rb +++ b/lib/gitlab/git/encoding_helper.rb @@ -49,9 +49,9 @@ module Gitlab private def clean(message) - message.encode("UTF-16BE", undef: :replace, invalid: :replace, replace: ""). - encode("UTF-8"). - gsub("\0".encode("UTF-8"), "") + message.encode("UTF-16BE", undef: :replace, invalid: :replace, replace: "") + .encode("UTF-8") + .gsub("\0".encode("UTF-8"), "") end end end |