Add ff-merge only checkbox to project settings

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/controllers/projects_controller.rb

@@ -195,7 +195,7 @@ class ProjectsController < ApplicationController
       :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, :merge_requests_rebase_default,
-      :approvals_before_merge, :approver_ids, :reset_approvals_on_push
+      :approvals_before_merge, :approver_ids, :reset_approvals_on_push, :merge_requests_ff_only_enabled
     )
   end
 

app/views/projects/_merge_request_settings.html.haml

@@ -2,6 +2,13 @@
   %legend
     Merge requests:
 
+  .form-group
+    .col-sm-offset-2.col-sm-10
+      .checkbox
+        = f.label :merge_requests_ff_only_enabled do
+          = f.check_box :merge_requests_ff_only_enabled
+          %span.descr Accept merge request button will do only fast-forward merges
+
   .form-group
     .col-sm-offset-2.col-sm-10
       .checkbox

db/migrate/20150827121444_add_fast_forward_option_to_project.rb

+class AddFastForwardOptionToProject < ActiveRecord::Migration
+  def change
+    add_column :projects, :merge_requests_ff_only_enabled, :boolean, default: false
+  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: 20150818213832) do
+ActiveRecord::Schema.define(version: 20150827121444) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -444,30 +444,31 @@ ActiveRecord::Schema.define(version: 20150818213832) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "creator_id"
-    t.boolean  "issues_enabled",                default: true,     null: false
-    t.boolean  "wall_enabled",                  default: true,     null: false
-    t.boolean  "merge_requests_enabled",        default: true,     null: false
-    t.boolean  "wiki_enabled",                  default: true,     null: false
+    t.boolean  "issues_enabled",                 default: true,     null: false
+    t.boolean  "wall_enabled",                   default: true,     null: false
+    t.boolean  "merge_requests_enabled",         default: true,     null: false
+    t.boolean  "wiki_enabled",                   default: true,     null: false
     t.integer  "namespace_id"
-    t.string   "issues_tracker",                default: "gitlab", null: false
+    t.string   "issues_tracker",                 default: "gitlab", null: false
     t.string   "issues_tracker_id"
-    t.boolean  "snippets_enabled",              default: true,     null: false
+    t.boolean  "snippets_enabled",               default: true,     null: false
     t.datetime "last_activity_at"
     t.string   "import_url"
-    t.integer  "visibility_level",              default: 0,        null: false
-    t.boolean  "archived",                      default: false,    null: false
+    t.integer  "visibility_level",               default: 0,        null: false
+    t.boolean  "archived",                       default: false,    null: false
     t.string   "avatar"
     t.string   "import_status"
-    t.float    "repository_size",               default: 0.0
+    t.float    "repository_size",                default: 0.0
     t.text     "merge_requests_template"
-    t.integer  "star_count",                    default: 0,        null: false
-    t.boolean  "merge_requests_rebase_enabled", default: false
+    t.integer  "star_count",                     default: 0,        null: false
+    t.boolean  "merge_requests_rebase_enabled",  default: false
     t.string   "import_type"
     t.string   "import_source"
-    t.boolean  "merge_requests_rebase_default", default: true
-    t.integer  "approvals_before_merge",        default: 0,        null: false
-    t.boolean  "reset_approvals_on_push",       default: true
-    t.integer  "commit_count",                  default: 0
+    t.boolean  "merge_requests_rebase_default",  default: true
+    t.integer  "approvals_before_merge",         default: 0,        null: false
+    t.boolean  "reset_approvals_on_push",        default: true
+    t.integer  "commit_count",                   default: 0
+    t.boolean  "merge_requests_ff_only_enabled", default: false
   end
 
   add_index "projects", ["created_at", "id"], name: "index_projects_on_created_at_and_id", using: :btree