Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

Former-commit-id: 3713fc6c

app/models/project_services/hipchat_service.rb

@@ -61,7 +61,7 @@ class HipchatService < Service
     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/#{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

doc/update/6.4-to-6.5.md

@@ -55,7 +55,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
     sudo service gitlab start
     sudo service nginx restart
-### 8. Check application status
+### 6. Check application status
 Check if GitLab and its environment are configured correctly: