diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-09 00:05:23 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-09 00:05:23 +0000 |
commit | 6213263d323e21357f682bb752c4dd9eb8421a03 (patch) | |
tree | 71188714d17e656360960946ba39db35a3356b37 /config | |
parent | 56f25c3e615752817446d5aedb7d66d25d815641 (diff) | |
parent | 23b6a98de00b966728f6b5ed3747b0d2e078165f (diff) | |
download | gitlab-ce-6213263d323e21357f682bb752c4dd9eb8421a03.tar.gz |
Merge branch 'mr-builds' into 'master'
Add Builds tab to MR detail page
## Before
![Screen_Shot_2015-12-08_at_13.21.04](/uploads/0d26060bef78f3de076e33439b8a4789/Screen_Shot_2015-12-08_at_13.21.04.png)
## After
![Screen_Shot_2015-12-08_at_13.25.20](/uploads/be7d7fd6d4fc8c5cc366b5b3778b813a/Screen_Shot_2015-12-08_at_13.25.20.png)
Fixes #3907
See merge request !2016
Diffstat (limited to 'config')
-rw-r--r-- | config/routes.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 59879c401a0..046e1800235 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -570,8 +570,9 @@ Rails.application.routes.draw do resources :merge_requests, constraints: { id: /\d+/ }, except: [:destroy] do member do - get :diffs get :commits + get :diffs + get :builds post :merge get :merge_check get :ci_status |