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:
authorValery Sizov <valery@gitlab.com>2015-02-03 08:30:11 +0300
committerValery Sizov <valery@gitlab.com>2015-02-03 20:10:56 +0300
commitb9d9ac82a9d650b659866ea26dcb4e7987f10381 (patch)
treea217436ecda22416b0c45d771ae89109738bfc5f /config
parent7bf203685210a7484c8deb03d7275e482656e2b3 (diff)
Commit page: async load branches info
Conflicts: config/routes.rb
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb
index a2d782cf633..512066e5d4e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -228,8 +228,12 @@ Gitlab::Application.routes.draw do
resources :raw, only: [:show], constraints: { id: /.+/ }
resources :tree, only: [:show], constraints: { id: /.+/, format: /(html|js)/ }
resource :avatar, only: [:show, :destroy]
- resources :commit, only: [:show], constraints: { id: /[[:alnum:]]{6,40}/ }
- resources :commits, only: [:show], constraints: { id: /(?:[^.]|\.(?!atom$))+/, format: /atom/ }
+
+ resources :commit, only: [:show], constraints: {id: /[[:alnum:]]{6,40}/} do
+ get :branches, on: :member
+ end
+
+ resources :commits, only: [:show], constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
resources :compare, only: [:index, :create]
resources :blame, only: [:show], constraints: { id: /.+/ }
resources :network, only: [:show], constraints: { id: /(?:[^.]|\.(?!json$))+/, format: /json/ }