diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-01 11:13:47 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:44 +0300 |
| commit | 99e00856ebb09b8edc9729b7f21a8005aaf02cb3 (patch) | |
| tree | 8371b4a2a0400ba9741415944d815e4027f8654e /config | |
| parent | f0bbfe7a62f8005188a46b25184c7f32eb098d14 (diff) | |
| download | gitlab-ce-99e00856ebb09b8edc9729b7f21a8005aaf02cb3.tar.gz | |
REMOVE THIS COMMIT: allow undoing last resolution
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 93da084b64a..91d33ea43e9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -729,6 +729,7 @@ Rails.application.routes.draw do post :remove_wip get :diff_for_path post :resolve_conflicts + post :undo_last_resolution end collection do |