From 298ae61dac32e43ff02db30aaeea491f0964b704 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Wed, 26 Nov 2014 13:46:34 +0100 Subject: [PATCH] Add rebase merge request setting to project settings page. --- app/assets/javascripts/project_new.js.coffee | 5 +++++ app/views/projects/edit.html.haml | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/app/assets/javascripts/project_new.js.coffee b/app/assets/javascripts/project_new.js.coffee index f4a2ca813d..4f34d91674 100644 --- a/app/assets/javascripts/project_new.js.coffee +++ b/app/assets/javascripts/project_new.js.coffee @@ -23,3 +23,8 @@ class @ProjectNew $('#project_issues_tracker_id').attr('disabled', 'disabled') else $('#project_issues_tracker_id').removeAttr('disabled') + + $("#project_merge_requests_enabled").change -> + checked = $(this).prop("checked") + $("#project_merge_requests_template").prop "disabled", not checked + $("#project_merge_requests_rebase_enabled").prop "disabled", not checked diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index d280636943..ec0de53cc0 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -66,6 +66,13 @@ = f.check_box :merge_requests_enabled %span.descr Submit changes to be merged upstream. + .form-group + = f.label :merge_requests_rebase_enabled, "Merge Requests Rebase", class: 'control-label' + .col-sm-10 + .checkbox + = f.check_box :merge_requests_rebase_enabled + %span.descr Allows rebasing of merge requests before merging. + .form-group = f.label :merge_requests_template, class: 'control-label' do Merge request template