diff options
| author | Timothy Andrew <tim@tim-mbp.local> | 2016-07-05 08:55:46 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-07-13 13:24:56 +0530 |
| commit | 4d00ed21ebbc9fd4a1f1b13cbed9a0a9ad2a2a9e (patch) | |
| tree | 3174c4ef24b3efae8ae94ea188103f15884d0f7b /spec/lib/gitlab | |
| parent | dffdc7b27c1f89e4e26b4714834e4f147c656206 (diff) | |
| download | gitlab-ce-4d00ed21ebbc9fd4a1f1b13cbed9a0a9ad2a2a9e.tar.gz | |
Appease rubocop.
Diffstat (limited to 'spec/lib/gitlab')
| -rw-r--r-- | spec/lib/gitlab/git_access_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/lib/gitlab/git_access_spec.rb b/spec/lib/gitlab/git_access_spec.rb index 059d8a2c355..db33c7a22bb 100644 --- a/spec/lib/gitlab/git_access_spec.rb +++ b/spec/lib/gitlab/git_access_spec.rb @@ -128,7 +128,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 |