Download as
Browse Code »

Commit 3713fc6cdfc45506668a1678503fac8e48221df0

Authored by Dmitriy Zaporozhets
2 parents 1eccec17 05eb6185
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

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

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/models/project_services/hipchat_service.rb
  Diff comments   View file @3713fc6
... ... @@ -61,7 +61,7 @@ class HipchatService < Service
61 61 elsif after =~ /000000/
62 62 message << "removed branch #{ref} from <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> \n"
63 63 else
64   - message << "#pushed to branch <a href=\"#{project.web_url}/commits/#{ref}\">#{ref}</a> "
  64 + message << "pushed to branch <a href=\"#{project.web_url}/commits/#{ref}\">#{ref}</a> "
65 65 message << "of <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> "
66 66 message << "(<a href=\"#{project.web_url}/compare/#{before}...#{after}\">Compare changes</a>)"
67 67 for commit in push[:commits] do
... ...
doc/update/6.4-to-6.5.md
  Diff comments   View file @3713fc6
... ... @@ -55,7 +55,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
55 55 sudo service gitlab start
56 56 sudo service nginx restart
57 57  
58   -### 8. Check application status
  58 +### 6. Check application status
59 59  
60 60 Check if GitLab and its environment are configured correctly:
61 61  
... ...