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

This commit is contained in:
Dmitriy Zaporozhets 2014-01-27 09:40:56 +02:00
commit 3713fc6cdf
2 changed files with 2 additions and 2 deletions

View file

@ -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

View file

@ -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: