diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-09 04:15:34 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-05-09 04:15:34 +0000 |
| commit | 0151325dacebb99d54b6effb1d5842c0c712168c (patch) | |
| tree | 767ea3c8cfeedab5a0ce1921d5842b149ea7c0be /config/routes | |
| parent | 9ada13d343a4736275d2c026ee980abe5c5e5763 (diff) | |
| download | gitlab-ce-0151325dacebb99d54b6effb1d5842c0c712168c.tar.gz | |
Merge request widget redesign
Diffstat (limited to 'config/routes')
| -rw-r--r-- | config/routes/project.rb | 9 |
1 files changed, 6 insertions, 3 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] |