Remove trailing slash from external_url in Environment#external_url_for

2 files changed, 7 insertions, 1 deletions

diff --git a/app/models/environment.rb b/app/models/environment.rb
index 392481ea0cc..72f695230e1 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -204,7 +204,7 @@ class Environment < ApplicationRecord
     public_path = project.public_path_for_source_path(path, commit_sha)
     return unless public_path
 
-    [external_url, public_path].join('/')
+    [external_url.delete_suffix('/'), public_path].join('/')
   end
 
   def expire_etag_cache
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index ce0681c4331..8e0adcbbf9d 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -804,6 +804,12 @@ describe Environment, :use_clean_rails_memory_store_caching do
       it 'returns the full external URL' do
         expect(environment.external_url_for(source_path, sha)).to eq('http://example.com/file.html')
       end
+
+      it 'returns the proper url when the environment external_url ends in a slash' do
+        environment.external_url = 'http://example.com/sub/'
+
+        expect(environment.external_url_for(source_path, sha)).to eq('http://example.com/sub/file.html')
+      end
     end
   end