Merge branch 'rebase_improve' into 'master'

Rebase requirements EMC

Closes #229

See merge request !309

app/controllers/projects_controller.rb

@@ -180,7 +180,7 @@ class ProjectsController < ApplicationController
       :name, :path, :description, :issues_tracker, :tag_list,
       :issues_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id, :default_branch,
       :wiki_enabled, :merge_requests_template, :visibility_level, :merge_requests_rebase_enabled,
-      :import_url, :last_activity_at, :namespace_id, :avatar
+      :import_url, :last_activity_at, :namespace_id, :avatar, :merge_requests_rebase_default
     )
   end
 

app/views/projects/edit.html.haml

@@ -64,6 +64,12 @@
                   = f.check_box :merge_requests_rebase_enabled
                   %span.descr Allows rebasing of merge requests before merging.
 
+              .rebase-default
+                .col-sm-10.col-sm-offset-3
+                  .checkbox
+                    = f.check_box :merge_requests_rebase_default
+                    %span.descr Enabled by default
+
             .form-group
               = f.label :merge_requests_template, class: 'control-label' do
                 Merge request template
@@ -221,3 +227,16 @@
 
 
 = render 'shared/confirm_modal', phrase: @project.path
+
+:coffeescript
+  $ ->
+    mergeRequestsRebaseVisibilityCheck = ->
+      is_rebase_enabled = $("input#project_merge_requests_rebase_enabled").prop("checked")
+      $(".rebase-default").toggle(is_rebase_enabled)
+
+    mergeRequestsRebaseVisibilityCheck()
+
+    $("input#project_merge_requests_rebase_enabled").change ->
+      mergeRequestsRebaseVisibilityCheck()
+
+

app/views/projects/merge_requests/show/_mr_accept.html.haml

@@ -24,7 +24,7 @@
           - if @merge_request.target_project.merge_requests_rebase_enabled && can_rebase?(@merge_request.target_project, @merge_request.target_branch)
             .accept-control.remove_branch_holder
               = label_tag :should_rebase, class: "checkbox" do
-                = check_box_tag :should_rebase
+                = check_box_tag :should_rebase, "1", @project.merge_requests_rebase_default
                 Rebase before merge
           .accept-control
             = link_to "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message" do

db/migrate/20150125163158_add_rebase_setting_to_projects.rb

+class AddRebaseSettingToProjects < ActiveRecord::Migration
+  def change
+    add_column :projects, :merge_requests_rebase_default, :boolean, default: true
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150125163100) do
+ActiveRecord::Schema.define(version: 20150125163158) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -387,6 +387,7 @@ ActiveRecord::Schema.define(version: 20150125163100) do
     t.boolean  "merge_requests_rebase_enabled", default: false
     t.string   "import_type"
     t.string   "import_source"
+    t.boolean  "merge_requests_rebase_default", default: true
   end
 
   add_index "projects", ["creator_id"], name: "index_projects_on_creator_id", using: :btree