From 52d59a4e5108d2ffd6f2bc543ee9aef1a87a8f14 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 25 Apr 2017 15:25:20 +0100 Subject: Load milestone tabs asynchronously --- config/routes/group.rb | 8 +++++++- config/routes/project.rb | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/routes/group.rb b/config/routes/group.rb index 73f69d76995..7b29e0e807c 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -10,7 +10,13 @@ scope(path: 'groups/*group_id', end resource :avatar, only: [:destroy] - resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create] + resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create] do + member do + get :merge_requests + get :participants + get :labels + end + end resources :labels, except: [:show] do post :toggle_subscription, on: :member diff --git a/config/routes/project.rb b/config/routes/project.rb index fa92202c1ea..e0f40e74500 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -205,6 +205,9 @@ constraints(ProjectUrlConstrainer.new) do member do put :sort_issues put :sort_merge_requests + get :merge_requests + get :participants + get :labels end end -- cgit v1.2.1 From e11a702afceee7f5edeb8c93a4192fa05209b091 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Fri, 28 Apr 2017 17:06:19 +0100 Subject: Re-wrote to match our docs - still not 100% sure but closer than it was --- config/webpack.config.js | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/webpack.config.js b/config/webpack.config.js index cb0a57a3a41..1721d275685 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -26,6 +26,7 @@ var config = { common_d3: ['d3'], cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', commit_pipelines: './commit/pipelines/pipelines_bundle.js', + deploy_keys: './deploy_keys/index.js', diff_notes: './diff_notes/diff_notes_bundle.js', environments: './environments/environments_bundle.js', environments_folder: './environments/folder/environments_folder_bundle.js', -- cgit v1.2.1 From 43ff7386411af0f538710f3627622f71e5e34472 Mon Sep 17 00:00:00 2001 From: Jarka Kadlecova 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.1 From b64a37c4ed5561d423ee607f9821b75fd0337168 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran 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.1 From 0f58eb6bde35009b69ef871534d9ff80fc38bbf7 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 2 May 2017 17:42:37 -0500 Subject: Add artifact file page that uses the blob viewer --- 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..5aba469b6e4 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -183,6 +183,7 @@ constraints(ProjectUrlConstrainer.new) do get :download get :browse, path: 'browse(/*path)', format: false get :file, path: 'file/*path', format: false + get :raw, path: 'raw/*path', format: false post :keep end end -- cgit v1.2.1 From 9904c12746e744c4e271fe454b04a54dfb9b668e Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Thu, 4 May 2017 15:57:08 +0100 Subject: Updated webpack config --- config/webpack.config.js | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/webpack.config.js b/config/webpack.config.js index 742d22d0c1f..239bb5ec436 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -123,6 +123,7 @@ var config = { 'boards', 'commit_pipelines', 'cycle_analytics', + 'deploy_keys', 'diff_notes', 'environments', 'environments_folder', -- cgit v1.2.1