Merge branch 'fix-setting-geo-capacity' into 'master'

Fix setting Geo sync capacity in the admin panel

See merge request gitlab-org/gitlab-ee!3184

app/services/geo/node_update_service.rb

@@ -5,7 +5,8 @@ module Geo
     def initialize(geo_node, params)
       @geo_node = geo_node
       @old_namespace_ids = geo_node.namespace_ids
-      @params = params.slice(:url, :primary, :namespace_ids)
+      @params = params.dup
+      @params.delete(:geo_node_key_attributes)
       @params[:namespace_ids] = @params[:namespace_ids].to_s.split(',')
     end
 

ee/app/controllers/admin/geo_nodes_controller.rb

@@ -77,7 +77,14 @@ class Admin::GeoNodesController < Admin::ApplicationController
   private
 
   def geo_node_params
-    params.require(:geo_node).permit(:url, :primary, :namespace_ids, geo_node_key_attributes: [:key])
+    params.require(:geo_node).permit(
+      :url,
+      :primary,
+      :namespace_ids,
+      :repos_max_capacity,
+      :files_max_capacity,
+      geo_node_key_attributes: [:key]
+    )
   end
 
   def check_license