diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 03:07:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 03:07:49 +0300 |
commit | 77237c5a6b9044f58beabc54d3589e5fa09cbfba (patch) | |
tree | f43188047fe8955f6cf78e05ae9c2e8f6a019e0b /lib/gitlab/git_post_receive.rb | |
parent | 2fd92f2dc784ade9cb4e1c33dd60cbfad7b86818 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/git_post_receive.rb')
-rw-r--r-- | lib/gitlab/git_post_receive.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/gitlab/git_post_receive.rb b/lib/gitlab/git_post_receive.rb index 5264bae47a1..13d991cdfbd 100644 --- a/lib/gitlab/git_post_receive.rb +++ b/lib/gitlab/git_post_receive.rb @@ -3,10 +3,10 @@ module Gitlab class GitPostReceive include Gitlab::Identifier - attr_reader :project, :identifier, :changes, :push_options + attr_reader :container, :identifier, :changes, :push_options - def initialize(project, identifier, changes, push_options = {}) - @project = project + def initialize(container, identifier, changes, push_options = {}) + @container = container @identifier = identifier @changes = parse_changes(changes) @push_options = push_options @@ -27,10 +27,10 @@ module Gitlab def includes_default_branch? # If the branch doesn't have a default branch yet, we presume the # first branch pushed will be the default. - return true unless project.default_branch.present? + return true unless container.default_branch.present? changes.branch_changes.any? do |change| - Gitlab::Git.branch_name(change[:ref]) == project.default_branch + Gitlab::Git.branch_name(change[:ref]) == container.default_branch end end |