diff options
| author | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-08-03 13:37:39 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-08-11 21:29:57 +0200 |
| commit | b497b0ce3fc3c1882639f9c7d55f7991ce41f15d (patch) | |
| tree | 353668ef819c38e3e9a208530a36501b4c524313 /app/models/deployment.rb | |
| parent | 826862d48ef80ddd849b9e3cb05ef37ba7be41e9 (diff) | |
| download | gitlab-ce-b497b0ce3fc3c1882639f9c7d55f7991ce41f15d.tar.gz | |
Incorporate feedback
Diffstat (limited to 'app/models/deployment.rb')
| -rw-r--r-- | app/models/deployment.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/deployment.rb b/app/models/deployment.rb index 67a4f3998ec..19b08f49d96 100644 --- a/app/models/deployment.rb +++ b/app/models/deployment.rb @@ -37,10 +37,10 @@ class Deployment < ActiveRecord::Base deployable.try(:other_actions) end - def deployed_to(ref) + def deployed_to?(ref) commit = project.commit(ref) return false unless commit - project.repository.merge_base(commit.id, sha) == commit.id + project.repository.is_ancestor?(commit.id, sha) end end |