diff options
| author | Felipe Artur <fcardozo@gitlab.com> | 2018-03-06 16:28:54 +0000 |
|---|---|---|
| committer | Felipe Artur <fcardozo@gitlab.com> | 2018-03-06 16:28:54 +0000 |
| commit | e77c4e9efe0e19187929e5836cda5a3a59d0f89f (patch) | |
| tree | 91daaa89bb48457456f931c6b818f5e200390b56 /config/routes | |
| parent | 1e137c273ca6314d0ed6744910b95f179b1d538c (diff) | |
| parent | 9a8f5a2b605f85ace3c81a32cf1855f79cabde43 (diff) | |
| download | gitlab-ce-e77c4e9efe0e19187929e5836cda5a3a59d0f89f.tar.gz | |
Merge branch 'master' into 'issue_38337'
# Conflicts:
# app/models/group.rb
# db/schema.rb
Diffstat (limited to 'config/routes')
| -rw-r--r-- | config/routes/repository.rb | 1 |
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 |