diff options
author | Fatih Acet <acetfatih@gmail.com> | 2017-05-09 07:15:34 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2017-05-09 07:15:34 +0300 |
commit | 0151325dacebb99d54b6effb1d5842c0c712168c (patch) | |
tree | 767ea3c8cfeedab5a0ce1921d5842b149ea7c0be /config | |
parent | 9ada13d343a4736275d2c026ee980abe5c5e5763 (diff) |
Merge request widget redesign
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/project.rb | 9 | ||||
-rw-r--r-- | config/webpack.config.js | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 7f6e5447b19..a6c104c2d3f 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -75,10 +75,9 @@ constraints(ProjectUrlConstrainer.new) do get :conflict_for_path get :pipelines get :merge_check + get :commit_change_content post :merge - get :merge_widget_refresh post :cancel_merge_when_pipeline_succeeds - get :ci_status get :pipeline_status get :ci_environments_status post :toggle_subscription @@ -146,7 +145,11 @@ constraints(ProjectUrlConstrainer.new) do get :folder, path: 'folders/*id', constraints: { format: /(html|json)/ } end - resources :deployments, only: [:index] + resources :deployments, only: [:index] do + member do + get :metrics + end + end end resource :cycle_analytics, only: [:show] diff --git a/config/webpack.config.js b/config/webpack.config.js index cb6bd949ddb..7e413c8493e 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -42,7 +42,6 @@ var config = { locale: './locale/index.js', main: './main.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', - merge_request_widget: './merge_request_widget/ci_bundle.js', monitoring: './monitoring/monitoring_bundle.js', network: './network/network_bundle.js', notebook_viewer: './blob/notebook_viewer.js', @@ -63,6 +62,7 @@ var config = { u2f: ['vendor/u2f'], users: './users/users_bundle.js', raven: './raven/index.js', + vue_merge_request_widget: './vue_merge_request_widget/index.js', }, output: { |