summaryrefslogtreecommitdiff
path: root/app/models/deployment.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/deployment.rb')
-rw-r--r--app/models/deployment.rb4
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