Commit 7ce9d0d2 authored by Timothy Andrew's avatar Timothy Andrew Committed by Timothy Andrew

Appease rubocop.

parent 50dbf36d
......@@ -221,10 +221,6 @@ module Gitlab
actor if actor.is_a?(DeployKey)
end
def deploy_key
actor if actor.is_a?(DeployKey)
end
def geo_node_key
actor if actor.is_a?(GeoNodeKey)
end
......@@ -237,7 +233,6 @@ module Gitlab
end
end
protected
def user
......
......@@ -144,7 +144,6 @@ describe Gitlab::GitAccess, lib: true do
rugged = project.repository.rugged
author = { email: "email@example.com", time: Time.now, name: "Example Git User" }
merge_index = rugged.merge_commits(target_branch, source_branch)
Rugged::Commit.create(rugged, author: author, committer: author, message: "commit message", parents: [target_branch, source_branch], tree: merge_index.write_tree(rugged))
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment