From 43ff7386411af0f538710f3627622f71e5e34472 Mon Sep 17 00:00:00 2001
From: Jarka Kadlecova <jarka@gitlab.com>
Date: Mon, 1 May 2017 15:14:35 +0200
Subject: Support uploaders for personal snippets comments

---
 config/routes/uploads.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'config')

diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb
index 2b22148a134..b315186b178 100644
--- a/config/routes/uploads.rb
+++ b/config/routes/uploads.rb
@@ -4,6 +4,11 @@ scope path: :uploads do
       to:           "uploads#show",
       constraints:  { model: /note|user|group|project/, mounted_as: /avatar|attachment/, filename: /[^\/]+/ }
 
+  # show uploads for models, snippets (notes) available for now
+  get ':model/:id/:secret/:filename',
+    to: 'uploads#show',
+    constraints: { model: /personal_snippet/, id: /\d+/, filename: /[^\/]+/ }
+
   # Appearance
   get ":model/:mounted_as/:id/:filename",
       to:           "uploads#show",
@@ -13,6 +18,12 @@ scope path: :uploads do
   get ":namespace_id/:project_id/:secret/:filename",
     to:           "projects/uploads#show",
     constraints:  { namespace_id: /[a-zA-Z.0-9_\-]+/, project_id: /[a-zA-Z.0-9_\-]+/, filename: /[^\/]+/ }
+
+  # create uploads for models, snippets (notes) available for now
+  post ':model/:id/',
+    to: 'uploads#create',
+    constraints: { model: /personal_snippet/, id: /\d+/ },
+    as: 'upload'
 end
 
 # Redirect old note attachments path to new uploads path.
-- 
cgit v1.2.3


From b64a37c4ed5561d423ee607f9821b75fd0337168 Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Thu, 4 May 2017 08:09:21 +0000
Subject: Allow to create new branch and empty WIP merge request from issue
 page

---
 config/routes/project.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

diff --git a/config/routes/project.rb b/config/routes/project.rb
index a15e365cc2f..956afe4faa3 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -234,6 +234,7 @@ constraints(ProjectUrlConstrainer.new) do
           get :related_branches
           get :can_create_branch
           get :rendered_title
+          post :create_merge_request
         end
         collection do
           post  :bulk_update
-- 
cgit v1.2.3