Merge branch 'develop'

UffizziCloud · Sep 7, 2023 · 20a93ff · 20a93ff
2 parents 6af8fe3 + d48f04e
commit 20a93ff
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: core
   specs:
-    uffizzi_core (2.2.20)
+    uffizzi_core (2.2.21)
       aasm
       actionpack (~> 6.1.0)
       active_model_serializers
@@ -111,7 +111,7 @@ GEM
     ast (2.4.2)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.817.0)
+    aws-partitions (1.818.0)
     aws-sdk-core (3.181.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)

diff --git a/core/Gemfile.lock b/core/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uffizzi_core (2.2.20)
+    uffizzi_core (2.2.21)
       aasm
       actionpack (~> 6.1.0)
       active_model_serializers
@@ -110,7 +110,7 @@ GEM
       activerecord (>= 5.2.6)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.817.0)
+    aws-partitions (1.818.0)
     aws-sdk-core (3.181.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)

diff --git a/core/app/lib/uffizzi_core/concerns/models/project.rb b/core/app/lib/uffizzi_core/concerns/models/project.rb
@@ -25,7 +25,7 @@ module UffizziCore::Concerns::Models::Project
     has_many :clusters, dependent: :destroy
 
     validates :name, presence: true
-    validates_uniqueness_of :name, conditions: -> { where(state: :active) }
+    validates_uniqueness_of :name, conditions: -> { where(state: :active)  }, scope: :account_id
     validates :slug, presence: true, uniqueness: true
 
     aasm(:state) do

diff --git a/core/lib/uffizzi_core/version.rb b/core/lib/uffizzi_core/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '2.2.20'
+  VERSION = '2.2.21'
 end