diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-21 13:22:56 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-21 13:22:56 +0400 |
| commit | 08994f3f6034eb214de4cda304d8797a51b2397a (patch) | |
| tree | 4a2b2cf4d3dec5c9300bbd25a6dc4091cd80a14d /config/routes.rb | |
| parent | 9af14e4bda3586d520c576911ecf109879f41aed (diff) | |
| parent | 3a6694b5516f4c5015a7745cf8182e74597b39ad (diff) | |
Merge remote-tracking branch 'origin/merge_button'
Conflicts:
app/assets/javascripts/merge_requests.js
db/schema.rb
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index a6e32bc1f5b..681bffc9506 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -100,6 +100,8 @@ Gitlab::Application.routes.draw do resources :merge_requests do member do get :diffs + get :automerge + get :automerge_check end collection do |