summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2016-05-02 13:21:59 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2016-05-02 13:21:59 +0200
commit9ce099429972726da22253407d98ae8aa1ef167b (patch)
treed074c3f4d05c0c2ba42545a1e96a0992b2dad009
parentd1f5019511a1dc630e97f99bdb1f6b9fe6b02bba (diff)
downloadgitlab-ce-9ce099429972726da22253407d98ae8aa1ef167b.tar.gz
Rubocop and whitespace
-rw-r--r--lib/gitlab/workhorse.rb4
-rw-r--r--spec/lib/gitlab/auth_spec.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 5b2982e4994..f9ceee142d7 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -36,9 +36,9 @@ module Gitlab
"git-archive:#{encode(params)}",
]
end
-
+
protected
-
+
def encode(hash)
Base64.urlsafe_encode64(JSON.dump(hash))
end
diff --git a/spec/lib/gitlab/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb
index 2c2f7ed0665..16083f90bb4 100644
--- a/spec/lib/gitlab/auth_spec.rb
+++ b/spec/lib/gitlab/auth_spec.rb
@@ -37,7 +37,7 @@ describe Gitlab::Auth, lib: true do
ip = 'ip'
expect(gl_auth).to receive(:rate_limit!).with(ip, success: false, login: login)
- expect(gl_auth.find(login, 'bar', project: nil, ip: ip)).to eq ([nil, nil])
+ expect(gl_auth.find(login, 'bar', project: nil, ip: ip)).to eq([nil, nil])
end
end