diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-30 13:35:33 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-30 13:35:33 +0300 |
| commit | 0d715bcd812ca6c99884e117f28a400669aa8e57 (patch) | |
| tree | 5690fa43c790af40c51441425b9d8be068d4139d /config | |
| parent | 4f07a6a99cab8f8ae3ad0a786a6cc9a837955c08 (diff) | |
| parent | 4d373005968b8269a8d2fe56b7776820396127a4 (diff) | |
| download | gitlab-ce-0d715bcd812ca6c99884e117f28a400669aa8e57.tar.gz | |
Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork
Conflicts:
app/views/projects/commit/show.html.haml
app/views/projects/compare/show.html.haml
app/views/projects/merge_requests/branch_from.js.haml
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index d303a57d304..4fe15b1feef 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -257,6 +257,7 @@ Gitlab::Application.routes.draw do collection do get :branch_from get :branch_to + get :update_branches end end |