Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-23 15:25:55 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-23 15:25:55 +0400
commit695fd3cf2c7e01d06e9c335cae208089a4c6bfbd (patch)
treeda03740535eb2c9d05262f5c760bba4b1346e06a /config
parent8ae2d2152b197931725a3f4b9aa3697f37988c20 (diff)
Move protected branches to Project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/config/routes.rb b/config/routes.rb
index da5a1ba7a87..ada9bb1d77a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -243,12 +243,7 @@ Gitlab::Application.routes.draw do
end
end
- resources :branches, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex } do
- collection do
- get :recent, constraints: { id: Gitlab::Regex.git_reference_regex }
- end
- end
-
+ resources :branches, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
resources :tags, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
resources :protected_branches, only: [:index, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }