summaryrefslogtreecommitdiff
path: root/app/models/environment.rb
diff options
context:
space:
mode:
authorjerasmus <jerasmus@gitlab.com>2018-10-15 12:42:24 +0200
committerjerasmus <jerasmus@gitlab.com>2018-10-15 12:42:24 +0200
commit58f29d5f855ea2e1411b99804a74710483a13f90 (patch)
tree0b06ecd3c0bb1bcf3d3c6660c2bc49eefaff08b2 /app/models/environment.rb
parent0572da24c990fc01d88acfbd32728221e3e3a711 (diff)
parenta9827357186e38e5732d8dae23d9d02b1f4c7218 (diff)
downloadgitlab-ce-58f29d5f855ea2e1411b99804a74710483a13f90.tar.gz
Merge branch 'master' into 48746-fix-files-uploaded-in-base6448746-fix-files-uploaded-in-base64
Diffstat (limited to 'app/models/environment.rb')
-rw-r--r--app/models/environment.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 309bd4f37c9..0816c395185 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -48,6 +48,8 @@ class Environment < ActiveRecord::Base
order(Gitlab::Database.nulls_first_order("(#{max_deployment_id_sql})", 'ASC'))
end
scope :in_review_folder, -> { where(environment_type: "review") }
+ scope :for_name, -> (name) { where(name: name) }
+ scope :for_project, -> (project) { where(project_id: project) }
state_machine :state, initial: :available do
event :start do