diff options
| author | Hiroyuki Sato <hiroyuki_sato@spiber.jp> | 2014-07-16 12:03:17 +0900 |
|---|---|---|
| committer | Hiroyuki Sato <hiroyuki_sato@spiber.jp> | 2014-07-18 20:20:18 +0900 |
| commit | a10f5fadb51ea6c516495c7e92c9527487cbc736 (patch) | |
| tree | 4ce6f8a38e64a38cb07a97f4ff9bca5110c2886f | |
| parent | 9879c427cef89a65d721133a62ff41a6e2a9057a (diff) | |
| download | gitlab-ce-a10f5fadb51ea6c516495c7e92c9527487cbc736.tar.gz | |
Fix 404 error when clicking the branch link on hipchat message
| -rw-r--r-- | app/models/project_services/hipchat_service.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb index 9c6fe7dab21..4c4c5cba60f 100644 --- a/app/models/project_services/hipchat_service.rb +++ b/app/models/project_services/hipchat_service.rb @@ -57,11 +57,15 @@ class HipchatService < Service message = "" message << "#{push[:user_name]} " if before =~ /000000/ - message << "pushed new branch <a href=\"#{project.web_url}/commits/#{ref}\">#{ref}</a> to <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a>\n" + message << "pushed new branch <a href=\""\ + "#{project.web_url}/commits/#{URI.escape(ref)}\">#{ref}</a>"\ + " to <a href=\"#{project.web_url}\">"\ + "#{project.name_with_namespace.gsub!(/\s/, "")}</a>\n" elsif after =~ /000000/ message << "removed branch #{ref} from <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> \n" else - message << "pushed to branch <a href=\"#{project.web_url}/commits/#{ref}\">#{ref}</a> " + message << "pushed to branch <a href=\""\ + "#{project.web_url}/commits/#{URI.escape(ref)}\">#{ref}</a> " message << "of <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> " message << "(<a href=\"#{project.web_url}/compare/#{before}...#{after}\">Compare changes</a>)" for commit in push[:commits] do |