Commit baf8afc6d34a01555141bc297d84f5bffd4393c0
Exists in
spb-stable
and in
3 other branches
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
app/views/projects/merge_requests/show/_mr_accept.html.haml
| @@ -60,7 +60,7 @@ | @@ -60,7 +60,7 @@ | ||
| 60 | 60 | ||
| 61 | .automerge_widget.already_cannot_be_merged.hide | 61 | .automerge_widget.already_cannot_be_merged.hide |
| 62 | .bs-callout.bs-callout-info | 62 | .bs-callout.bs-callout-info |
| 63 | - %strong This merge request already can not be merged. Try to reload page. | 63 | + %strong This merge request can not be merged. Try to reload the page. |
| 64 | 64 | ||
| 65 | .merge-in-progress.hide | 65 | .merge-in-progress.hide |
| 66 | .bs-callout.bs-callout-success | 66 | .bs-callout.bs-callout-success |
doc/update/5.4-to-6.0.md
| @@ -87,8 +87,8 @@ sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production | @@ -87,8 +87,8 @@ sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production | ||
| 87 | 87 | ||
| 88 | Note: We switched from Puma in GitLab 5.4 to unicorn in GitLab 6.0. | 88 | Note: We switched from Puma in GitLab 5.4 to unicorn in GitLab 6.0. |
| 89 | 89 | ||
| 90 | -* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/masterconfig/gitlab.yml.example but with your settings. | ||
| 91 | -* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/masterconfig/unicorn.rb.example but with your settings. | 90 | +* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example but with your settings. |
| 91 | +* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/unicorn.rb.example but with your settings. | ||
| 92 | 92 | ||
| 93 | ### 7. Update Init script | 93 | ### 7. Update Init script |
| 94 | 94 |