Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 8 deletions

diff --git a/app/services/organizations/base_service.rb b/app/services/organizations/base_service.rb
index 3e734e3cd0c..6f91a81096f 100644
--- a/app/services/organizations/base_service.rb
+++ b/app/services/organizations/base_service.rb
@@ -9,11 +9,19 @@ module Organizations
     def initialize(current_user: nil, params: {})
       @current_user = current_user
       @params = params.dup
-      return unless @params.key?(:description)
 
-      organization_detail_attributes = { description: @params.delete(:description) }
+      build_organization_detail_attributes
+    end
+
+    private
+
+    def build_organization_detail_attributes
       @params[:organization_detail_attributes] ||= {}
-      @params[:organization_detail_attributes].merge!(organization_detail_attributes)
+
+      organization_detail_attributes = [:description, :avatar]
+      organization_detail_attributes.each do |attribute|
+        @params[:organization_detail_attributes][attribute] = @params.delete(attribute) if @params.key?(attribute)
+      end
     end
   end
 end
diff --git a/app/services/organizations/update_service.rb b/app/services/organizations/update_service.rb
index e262bd15bc0..1efb8b6fe22 100644
--- a/app/services/organizations/update_service.rb
+++ b/app/services/organizations/update_service.rb
@@ -8,13 +8,10 @@ module Organizations
       @organization = organization
       @current_user = current_user
       @params = params.dup
-      return unless @params.key?(:description)
 
-      organization_detail_attributes = { description: @params.delete(:description) }
+      build_organization_detail_attributes
       # TODO: Remove explicit passing of id once https://github.com/rails/rails/issues/48714 is resolved.
-      organization_detail_attributes[:id] = organization.id
-      @params[:organization_detail_attributes] ||= {}
-      @params[:organization_detail_attributes].merge!(organization_detail_attributes)
+      @params[:organization_detail_attributes][:id] = organization.id
     end
 
     def execute