Merge branch 'master' into snyk-fix-bebd46ff39b40e88280eb0ad35f47455

app/controllers/tool_profile_controller.rb

@@ -132,8 +132,8 @@ def xml_config_tc(launch_url)
       tc.set_ext_param(platform, :icon_url, tc.icon)
       tc.set_ext_param(platform, :domain, request.host_with_port)
 
-      params[:custom_params]&.each { |_, v| tc.set_custom_param(v[:name].to_sym, v[:value]) }
-      params[:placements]&.each { |k, _| create_placement(tc, k.to_sym) }
+      params[:custom_params]&.each_value { |v| tc.set_custom_param(v[:name].to_sym, v[:value]) }
+      params[:placements]&.each_key { |k| create_placement(tc, k.to_sym) }
     end
     tc.to_xml(indent: 2)
   end

tenant_settings.md

@@ -0,0 +1,13 @@
+# Settings that are Configurable Per Tenant 
+(applicable only for use with the Rooms application)
+
+To add a settings for a specific tenant, use the following rake task: `rake db:tenants:settings:upsert[<tenant uid>, <setting key>, <setting value>]`
+
+| Setting Key |	Description |
+| ----------  | ----------  |
+| bigbluebutton_url | The URL of the BBB server to be used |
+| bigbluebutton_secret | The secret for the BBB server to be used |
+| handler_params | The launch parameters to use for creating the room ID. To add more than one parameter, use the following syntax: "param1\\,param2". For example: "context_id\\,resource_link_id" |
+| enable_shared_rooms | Whether or not to enable the shared rooms feature. The default is false. |
+
+