From 4c8f3699f1f1334f1b7ed964d4b6ca985796211a Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 21 Aug 2013 12:36:38 +0300
Subject: [PATCH 1/3] Fix branch name for update docs

---
 doc/update/5.4-to-6.0.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/update/5.4-to-6.0.md b/doc/update/5.4-to-6.0.md
index 9479985254..5f4e21acb3 100644
--- a/doc/update/5.4-to-6.0.md
+++ b/doc/update/5.4-to-6.0.md
@@ -36,7 +36,7 @@ sudo -u git -H RAILS_ENV=production bundle exec rake gitlab:backup:create
 ```bash
 cd /home/git/gitlab
 sudo -u git -H git fetch
-sudo -u git -H git checkout 6-0-dev
+sudo -u git -H git checkout 6-0-stable
 ```
 
 ### 3. Install additional packages

From 2afd4aaa1779165e8fb36aeedb456e0b00919b4b Mon Sep 17 00:00:00 2001
From: Chris Roemmich <chris@cr-wd.com>
Date: Tue, 20 Aug 2013 14:13:49 -0500
Subject: [PATCH 2/3] Update to gitlab-shell 1.7.0 during 5.4-6.0 update

---
 doc/update/5.4-to-6.0.md | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/doc/update/5.4-to-6.0.md b/doc/update/5.4-to-6.0.md
index 5f4e21acb3..23993d0553 100644
--- a/doc/update/5.4-to-6.0.md
+++ b/doc/update/5.4-to-6.0.md
@@ -39,14 +39,22 @@ sudo -u git -H git fetch
 sudo -u git -H git checkout 6-0-stable
 ```
 
-### 3. Install additional packages
+### 3. Update gitlab-shell
+
+```bash
+cd /home/git/gitlab-shell
+sudo -u git -H git fetch
+sudo -u git -H git checkout v1.7.0
+```
+
+### 4. Install additional packages
 
 ```bash
 # For reStructuredText markup language support install required package:
 sudo apt-get install python-docutils
 ```
 
-### 4. Install libs, migrations, etc.
+### 5. Install libs, migrations, etc.
 
 ```bash
 cd /home/git/gitlab
@@ -65,14 +73,14 @@ sudo -u git -H bundle exec rake migrate_inline_notes RAILS_ENV=production
 
 ```
 
-### 5. Update config files
+### 6. Update config files
 
 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://github.com/gitlabhq/gitlabhq/blob/master/config/gitlab.yml.example but with your settings.
 * Make `/home/git/gitlab/config/unicorn.rb` the same as https://github.com/gitlabhq/gitlabhq/blob/master/config/unicorn.rb.example but with your settings.
 
-### 6. Update Init script
+### 7. Update Init script
 
 ```bash
 sudo rm /etc/init.d/gitlab
@@ -80,12 +88,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/m
 sudo chmod +x /etc/init.d/gitlab
 ```
 
-### 7. Start application
+### 8. Start application
 
     sudo service gitlab start
     sudo service nginx restart
 
-### 8. Check application status
+### 9. Check application status
 
 Check if GitLab and its environment are configured correctly:
 

From 86c9737307fb2fe61f5e4c2dab79d1cf08c4bdac Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 22 Aug 2013 17:50:24 +0300
Subject: [PATCH 3/3] Fix issue when project owner cant close MR from forked
 project

---
 app/models/merge_request.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index b7df2e40a1..d525ad1753 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -250,6 +250,10 @@ class MergeRequest < ActiveRecord::Base
     (source_project.root_ref? source_branch) || for_fork?
   end
 
+  def project
+    target_project
+  end
+
   private
 
   def dump_commits(commits)