diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-10 15:38:53 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-10 15:38:53 +0200 |
| commit | baf8afc6d34a01555141bc297d84f5bffd4393c0 (patch) | |
| tree | 4496821aea0ed9982508d64e780e708627f2cf06 | |
| parent | 8342f73de8f5b04b4a111fd2f1f34ed916014f35 (diff) | |
| parent | 6cf24ba9d791ee5e3a57fae3b418732358f467e6 (diff) | |
| download | gitlab-ce-baf8afc6d34a01555141bc297d84f5bffd4393c0.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_accept.html.haml | 2 | ||||
| -rw-r--r-- | doc/update/5.4-to-6.0.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml index 83f2db03b18..a9cbe43fb16 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -60,7 +60,7 @@ .automerge_widget.already_cannot_be_merged.hide .bs-callout.bs-callout-info - %strong This merge request already can not be merged. Try to reload page. + %strong This merge request can not be merged. Try to reload the page. .merge-in-progress.hide .bs-callout.bs-callout-success diff --git a/doc/update/5.4-to-6.0.md b/doc/update/5.4-to-6.0.md index bcba3ee4d05..a1a406fe7e9 100644 --- a/doc/update/5.4-to-6.0.md +++ b/doc/update/5.4-to-6.0.md @@ -87,8 +87,8 @@ sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production Note: We switched from Puma in GitLab 5.4 to unicorn in GitLab 6.0. -* 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. -* 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. +* 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. +* 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. ### 7. Update Init script |