diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-11-16 16:05:03 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-11-16 16:05:03 +0100 |
| commit | d2d64393ed0e64fd63981d5d02fee52fa16a081c (patch) | |
| tree | f3e105279a5c0c77cd09a2d7d5757bdf21536d8e /config/routes | |
| parent | d64183e1fa26ab77107e3a2a20be1fe4df3a1875 (diff) | |
| parent | b7aae9a6cde71dfc448d8da34ebe38104068387c (diff) | |
| download | gitlab-ce-d2d64393ed0e64fd63981d5d02fee52fa16a081c.tar.gz | |
Merge remote-tracking branch 'origin/master' into chat-name-authorize
Diffstat (limited to 'config/routes')
| -rw-r--r-- | config/routes/project.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 82defb0ba71..9cf8465dca8 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -125,6 +125,7 @@ resources :namespaces, path: '/', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: end resources :branches, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex } + delete :merged_branches, controller: 'branches', action: :destroy_all_merged resources :tags, only: [:index, :show, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex } do resource :release, only: [:edit, :update] end |