Merge branch 'prefer-ref' into 'master'

Prefer ref rather than id because id is shadowing database id ## What does this MR do? Just a local variable renaming. ## Why was this MR needed? Prefer ref rather than id because id is shadowing database id. See merge request !5134

Merge branch 'prefer-ref' into 'master'
5d3a0d38 · Douwe Maan · dad406da · 93dd8b0a · 5d3a0d38 · 5d3a0d38
Commit 5d3a0d38 authored Jul 07, 2016 by Douwe Maan
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

project.rb app/models/project.rb +2 -2

repository.rb app/models/repository.rb +2 -2

No files found.
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -425,8 +425,8 @@ class Project < ActiveRecord::Base
    container_registry_repository.tags.any?
  end
-  def commit(id = 'HEAD')
+  def commit(ref = 'HEAD')
-    repository.commit(id)
+    repository.commit(ref)
  end
  def merge_base_commit(first_commit_id, second_commit_id)

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -78,9 +78,9 @@ class Repository
    end
  end
-  def commit(id = 'HEAD')
+  def commit(ref = 'HEAD')
    return nil unless exists?
-    commit = Gitlab::Git::Commit.find(raw_repository, id)
+    commit = Gitlab::Git::Commit.find(raw_repository, ref)
    commit = ::Commit.new(commit, @project) if commit
    commit
  rescue Rugged::OdbError