From faf7865c269044ea49f64858f60a8bd33a715727 Mon Sep 17 00:00:00 2001 From: Bryce Johnson Date: Tue, 7 Mar 2017 19:04:20 -0500 Subject: Lightly refactor js files related to file template selectors. --- config/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/webpack.config.js b/config/webpack.config.js index 3cf94b9b435..0859c8416c8 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -21,7 +21,7 @@ var config = { common_vue: ['vue', './vue_shared/common_vue.js'], common_d3: ['d3'], main: './main.js', - blob_edit: './blob_edit/blob_edit_bundle.js', + blob: './blob_edit/blob_bundle.js', boards: './boards/boards_bundle.js', simulate_drag: './test_utils/simulate_drag.js', cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', -- cgit v1.2.1 From 0e06cfc059af0b70b366ab1eaf75f7601fdcb5e1 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Tue, 28 Feb 2017 04:17:21 +0900 Subject: Add api points for ci cd status. Add favicon. --- config/routes/project.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config') diff --git a/config/routes/project.rb b/config/routes/project.rb index 44b8ae7aedd..2c6d4518772 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -102,6 +102,7 @@ constraints(ProjectUrlConstrainer.new) do get :merge_widget_refresh post :cancel_merge_when_pipeline_succeeds get :ci_status + get :ci_cd_status get :ci_environments_status post :toggle_subscription post :remove_wip @@ -152,6 +153,7 @@ constraints(ProjectUrlConstrainer.new) do post :cancel post :retry get :builds + get :ci_cd_status end end @@ -203,6 +205,7 @@ constraints(ProjectUrlConstrainer.new) do post :erase get :trace get :raw + get :ci_cd_status end resource :artifacts, only: [] do -- cgit v1.2.1 From ba27f1b954e79713ec1905b46ee5ba1b940418f0 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Fri, 3 Mar 2017 15:59:25 +0900 Subject: Expose only status. ci_cd_status to status. Support abstract class. --- config/routes/project.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/routes/project.rb b/config/routes/project.rb index 2c6d4518772..1df066ff55d 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -102,7 +102,7 @@ constraints(ProjectUrlConstrainer.new) do get :merge_widget_refresh post :cancel_merge_when_pipeline_succeeds get :ci_status - get :ci_cd_status + get :status get :ci_environments_status post :toggle_subscription post :remove_wip @@ -153,7 +153,7 @@ constraints(ProjectUrlConstrainer.new) do post :cancel post :retry get :builds - get :ci_cd_status + get :status end end @@ -205,7 +205,6 @@ constraints(ProjectUrlConstrainer.new) do post :erase get :trace get :raw - get :ci_cd_status end resource :artifacts, only: [] do -- cgit v1.2.1 From 361f85122b4d226224e6fc8c9e4beac940ff10bf Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Fri, 17 Mar 2017 15:58:12 +0900 Subject: Rename endpoints 'status' to 'pipeline_status' in merge_requests --- config/routes/project.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/routes/project.rb b/config/routes/project.rb index 1df066ff55d..823e0614aeb 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -102,7 +102,7 @@ constraints(ProjectUrlConstrainer.new) do get :merge_widget_refresh post :cancel_merge_when_pipeline_succeeds get :ci_status - get :status + get :pipeline_status get :ci_environments_status post :toggle_subscription post :remove_wip -- cgit v1.2.1