From 967bcffcc83507b918ea355e2ede9349e085182c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me> Date: Thu, 4 Oct 2018 12:40:33 +0200 Subject: [PATCH] Resolve config/routes/project.rb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable <remy@rymai.me> --- config/routes/project.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/config/routes/project.rb b/config/routes/project.rb index cd6bce9b641..4e91b441843 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -430,12 +430,11 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end collection do post :bulk_update -<<<<<<< HEAD - post :export_csv - get :service_desk ## EE-specific -======= ->>>>>>> upstream/master + ## EE-specific START + post :export_csv + get :service_desk + ## EE-specific END end resources :issue_links, only: [:index, :create, :destroy], as: 'links', path: 'links' -- 2.30.9