Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr

1 files changed, 15 insertions, 0 deletions

diff --git a/app/models/environment.rb b/app/models/environment.rb
index 6ec498ea2b7..07f14a7ad8d 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -66,7 +66,22 @@ class Environment < ActiveRecord::Base
     self.name == "production"
   end
 
+  def first_deployment_for(commit)
+    ref = project.repository.ref_name_for_sha(ref_path, commit.sha)
+
+    return nil unless ref
+
+    deployment_id = ref.split('/').last
+    deployments.find(deployment_id)
+  end
+
   def ref_path
     "refs/environments/#{Shellwords.shellescape(name)}"
   end
+
+  def formatted_external_url
+    return nil unless external_url
+
+    external_url.gsub(/\A.*?:\/\//, '')
+  end
 end