Commit 3713fc6cdfc45506668a1678503fac8e48221df0
Exists in
spb-stable
and in
3 other branches
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
| @@ -61,7 +61,7 @@ class HipchatService < Service | @@ -61,7 +61,7 @@ class HipchatService < Service | ||
| 61 | elsif after =~ /000000/ | 61 | elsif after =~ /000000/ |
| 62 | message << "removed branch #{ref} from <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> \n" | 62 | message << "removed branch #{ref} from <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> \n" |
| 63 | else | 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 | message << "of <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> " | 65 | message << "of <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> " |
| 66 | message << "(<a href=\"#{project.web_url}/compare/#{before}...#{after}\">Compare changes</a>)" | 66 | message << "(<a href=\"#{project.web_url}/compare/#{before}...#{after}\">Compare changes</a>)" |
| 67 | for commit in push[:commits] do | 67 | 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 | @@ -55,7 +55,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab | ||
| 55 | sudo service gitlab start | 55 | sudo service gitlab start |
| 56 | sudo service nginx restart | 56 | sudo service nginx restart |
| 57 | 57 | ||
| 58 | -### 8. Check application status | 58 | +### 6. Check application status |
| 59 | 59 | ||
| 60 | Check if GitLab and its environment are configured correctly: | 60 | Check if GitLab and its environment are configured correctly: |
| 61 | 61 |