Skip to content
Snippets Groups Projects
Commit 4d00ed21 authored by Timothy Andrew's avatar Timothy Andrew Committed by Timothy Andrew
Browse files

Appease rubocop.

parent dffdc7b2
No related branches found
No related tags found
No related merge requests found
Loading
@@ -108,7 +108,6 @@ module Gitlab
Loading
@@ -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)
Loading
Loading
Loading
@@ -128,7 +128,6 @@ describe Gitlab::GitAccess, lib: true do
Loading
@@ -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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment