1 files changed, 8 insertions, 0 deletions
diff --git a/lib/atlassian/jira_connect.rb b/lib/atlassian/jira_connect.rb
index 595cf0ac465..3ebed08280a 100644
--- a/lib/atlassian/jira_connect.rb
+++ b/lib/atlassian/jira_connect.rb
@@ -17,8 +17,16 @@ module Atlassian
       private
 
       def gitlab_host
+        return host_from_settings if Gitlab::CurrentSettings.jira_connect_proxy_url?
+
         Gitlab.config.gitlab.host
       end
+
+      def host_from_settings
+        uri = URI(Gitlab::CurrentSettings.jira_connect_proxy_url)
+
+        uri.hostname + uri.path
+      end
     end
   end
 end