Merge branch '2039-fix-elasticsearch-url-with-path' into 'master'

Strip trailing forward slashes from elasticsearch URLs

Closes #2039

See merge request !1566

app/models/application_setting.rb

@@ -301,6 +301,12 @@ class ApplicationSetting < ActiveRecord::Base
     read_attribute(:elasticsearch_url).split(',').map(&:strip)
   end
 
+  def elasticsearch_url=(values)
+    cleaned = values.split(',').map {|url| url.strip.gsub(%r{/*\z}, '') }
+
+    write_attribute(:elasticsearch_url, cleaned.join(','))
+  end
+
   def elasticsearch_config
     {
       url:                   elasticsearch_url,

changelogs/unreleased-ee/2039-fix-elasticsearch-url-with-path.yml

+---
+title: Fix Elasticsearch not working when URL ends with a forward slash
+merge_request: 1566
+author:

spec/models/application_setting_spec.rb

@@ -299,6 +299,12 @@ describe ApplicationSetting, models: true do
 
       expect(setting.elasticsearch_url).to eq(%w[http://example.com https://invalid.invalid:9200])
     end
+
+    it 'strips trailing slashes from URLs' do
+      setting.elasticsearch_url = 'http://example.com/, https://example.com:9200/, https://example.com:9200/prefix//'
+
+      expect(setting.elasticsearch_url).to eq(%w[http://example.com https://example.com:9200 https://example.com:9200/prefix])
+    end
   end
 
   describe '#elasticsearch_config' do