diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-07-01 11:38:16 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-07-01 11:38:16 +0300 |
| commit | 8775e4a1faf13a01451e71ea9ef729dc52e6d3c1 (patch) | |
| tree | 8632c5465f6b3dee57bb0ccd64f5162c35b8ab15 /config | |
| parent | f63dc06cb4572db92bb91c936e9862c55f1f365e (diff) | |
| parent | ca5cd7b7fb5108d30d0f6b74e31da736024592dd (diff) | |
Merge branch 'id-stale-branches' into 'master'
Add endpoint for fetching diverging commit counts
See merge request gitlab-org/gitlab-ce!29802
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/repository.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/routes/repository.rb b/config/routes/repository.rb index 1ea0ae72614..b89e1c7f9af 100644 --- a/config/routes/repository.rb +++ b/config/routes/repository.rb @@ -52,7 +52,10 @@ scope format: false do end get '/branches/:state', to: 'branches#index', as: :branches_filtered, constraints: { state: /active|stale|all/ } - resources :branches, only: [:index, :new, :create, :destroy] + resources :branches, only: [:index, :new, :create, :destroy] do + get :diverging_commit_counts, on: :collection + end + delete :merged_branches, controller: 'branches', action: :destroy_all_merged resources :tags, only: [:index, :show, :new, :create, :destroy] do resource :release, controller: 'tags/releases', only: [:edit, :update] |