From cb13980db88c1d1ae8a5cd766ced4629c657010b Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 8 Oct 2015 17:12:00 +0200
Subject: Let gitlab-git-http-server handle archive downloads

This change relies on changes in gitlab_git and gitlab-git-http-server.
---
 lib/api/repositories.rb | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'lib/api')

diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb
index 2d96c9666d2..20d568cf462 100644
--- a/lib/api/repositories.rb
+++ b/lib/api/repositories.rb
@@ -133,7 +133,7 @@ module API
         authorize! :download_code, user_project
 
         begin
-          file_path = ArchiveRepositoryService.new(
+          ArchiveRepositoryService.new(
             user_project,
             params[:sha],
             params[:format]
@@ -141,17 +141,6 @@ module API
         rescue
           not_found!('File')
         end
-
-        if file_path && File.exists?(file_path)
-          data = File.open(file_path, 'rb').read
-          basename = File.basename(file_path)
-          header['Content-Disposition'] = "attachment; filename=\"#{basename}\""
-          content_type MIME::Types.type_for(file_path).first.content_type
-          env['api.format'] = :binary
-          present data
-        else
-          redirect request.fullpath
-        end
       end
 
       # Compare two branches, tags or commits
-- 
cgit v1.2.1


From 2df573dac3859034fcb90566a8ebc270a7e6088a Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 9 Oct 2015 09:14:35 -0700
Subject: Fix bug where merge request comments created by API would not trigger
 notifications

Closes https://github.com/gitlabhq/gitlabhq/issues/9715
---
 lib/api/merge_requests.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'lib/api')

diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 63ea2f05438..8cfc8ee6713 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -249,8 +249,16 @@ module API
         required_attributes! [:note]
 
         merge_request = user_project.merge_requests.find(params[:merge_request_id])
-        note = merge_request.notes.new(note: params[:note], project_id: user_project.id)
-        note.author = current_user
+
+        authorize! :create_note, merge_request
+
+        opts = {
+          note: params[:note],
+          noteable_type: 'MergeRequest',
+          noteable_id: merge_request.id
+        }
+
+        note = ::Notes::CreateService.new(user_project, current_user, opts).execute
 
         if note.save
           present note, with: Entities::MRNote
-- 
cgit v1.2.1


From df99ddbba13db4a7699bf1d585675f921cf382ce Mon Sep 17 00:00:00 2001
From: Han Loong Liauw <hanloongliauw@gmail.com>
Date: Tue, 13 Oct 2015 21:24:44 +1100
Subject: Adds ability to remove the forked relationship

This was previously possible through the API but can now be done
through the project#edit settings screen if the current user is
the owner of the project.
Update changelog
---
 lib/api/projects.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/api')

diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index c2fb36b4143..e8a0e7f3ec9 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -247,7 +247,7 @@ module API
       #  DELETE /projects/:id/fork
       delete ":id/fork" do
         authenticated_as_admin!
-        unless user_project.forked_project_link.nil?
+        if user_project.forked?
           user_project.forked_project_link.destroy
         end
       end
-- 
cgit v1.2.1


From 0bea5ced8bf4c9306f8f8e912313731a43d16f4c Mon Sep 17 00:00:00 2001
From: Han Loong Liauw <hanloongliauw@gmail.com>
Date: Wed, 14 Oct 2015 09:04:22 +1100
Subject: Made suggested content changes based on MR Review

Changed the authentication method for removing fork through API
Reflected changes to new auth method in API specs
---
 lib/api/projects.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/api')

diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index e8a0e7f3ec9..67ee66a2058 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -246,7 +246,7 @@ module API
       # Example Request:
       #  DELETE /projects/:id/fork
       delete ":id/fork" do
-        authenticated_as_admin!
+        authorize! :remove_fork_project, user_project
         if user_project.forked?
           user_project.forked_project_link.destroy
         end
-- 
cgit v1.2.1