diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-05-29 20:51:43 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-05-29 20:51:43 +1100 |
| commit | 4cff66a6c46361e8d775ea3f5a80bf147d4020b3 (patch) | |
| tree | f1f76411400f35f394fedd28ad03d42ccbaf990e /app/controllers/projects/merge_requests/application_controller.rb | |
| parent | 6e354cb642f911dc71be3d5368f066900fc25970 (diff) | |
| download | gitlab-ce-4cff66a6c46361e8d775ea3f5a80bf147d4020b3.tar.gz | |
Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ce
Diffstat (limited to 'app/controllers/projects/merge_requests/application_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests/application_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests/application_controller.rb b/app/controllers/projects/merge_requests/application_controller.rb index 67d4ea2ca8f..29632bef7e5 100644 --- a/app/controllers/projects/merge_requests/application_controller.rb +++ b/app/controllers/projects/merge_requests/application_controller.rb @@ -24,6 +24,7 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont :source_branch, :source_project_id, :state_event, + :squash, :target_branch, :target_project_id, :task_num, |