Commit 4d00ed21 authored by Timothy Andrew's avatar Timothy Andrew Committed by Timothy Andrew

Appease rubocop.

parent dffdc7b2
...@@ -108,7 +108,6 @@ module Gitlab ...@@ -108,7 +108,6 @@ module Gitlab
actor if actor.is_a?(DeployKey) actor if actor.is_a?(DeployKey)
end end
def deploy_key_can_read_project? def deploy_key_can_read_project?
if deploy_key if deploy_key
deploy_key.projects.include?(project) deploy_key.projects.include?(project)
......
...@@ -128,7 +128,6 @@ describe Gitlab::GitAccess, lib: true do ...@@ -128,7 +128,6 @@ describe Gitlab::GitAccess, lib: true do
rugged = project.repository.rugged rugged = project.repository.rugged
author = { email: "email@example.com", time: Time.now, name: "Example Git User" } author = { email: "email@example.com", time: Time.now, name: "Example Git User" }
merge_index = rugged.merge_commits(target_branch, source_branch) 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)) Rugged::Commit.create(rugged, author: author, committer: author, message: "commit message", parents: [target_branch, source_branch], tree: merge_index.write_tree(rugged))
end 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