summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-03-06 13:14:10 +0000
committerRémy Coutable <remy@rymai.me>2018-03-06 13:14:10 +0000
commitaf84ccbd8227ac6d4d609bc8ff941ee6cad131f5 (patch)
tree50bb5c96a390c12af72126c50ce9c0583833f3b7 /config
parentfa31559a37bfe394dedf4078789f1540e01fc5c7 (diff)
parent580d8953636266e40802fd8ea525c4908ebc8b9f (diff)
downloadgitlab-ce-af84ccbd8227ac6d4d609bc8ff941ee6cad131f5.tar.gz
Merge branch '40187-project-branch-dashboard-with-active-stale-branches' into 'master'
Add overview of branches and filtered views for active/stale branches Closes #40187 et #17293 See merge request gitlab-org/gitlab-ce!15402
Diffstat (limited to 'config')
-rw-r--r--config/routes/repository.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes/repository.rb b/config/routes/repository.rb
index 9ffdebbcff1..eace3a615b4 100644
--- a/config/routes/repository.rb
+++ b/config/routes/repository.rb
@@ -49,6 +49,7 @@ scope format: false do
end
end
+ get '/branches/:state', to: 'branches#index', as: :branches_filtered, constraints: { state: /active|stale|all/ }
resources :branches, only: [:index, :new, :create, :destroy]
delete :merged_branches, controller: 'branches', action: :destroy_all_merged
resources :tags, only: [:index, :show, :new, :create, :destroy] do