From 898d4fe37d6461daf5b4e2c31620cf9e11e682f0 Mon Sep 17 00:00:00 2001 From: Robert Schilling Date: Sun, 9 Feb 2014 18:53:06 +0100 Subject: [PATCH 1/2] Fixes #6187, Update dead links --- doc/update/5.4-to-6.0.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 725d35edc2680479c83bc9db94d4ac0489be735c Mon Sep 17 00:00:00 2001 From: Robert Schilling Date: Sun, 9 Feb 2014 20:20:42 +0100 Subject: [PATCH 2/2] Fixes #6073, Update grammer in MR accept form --- app/views/projects/merge_requests/show/_mr_accept.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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