diff options
| -rw-r--r-- | app/controllers/merge_requests_controller.rb | 15 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 9 | ||||
| -rw-r--r-- | app/views/merge_requests/show.html.haml | 17 | ||||
| -rw-r--r-- | db/migrate/20120329170745_add_automerge_to_merge_request.rb | 6 | ||||
| -rw-r--r-- | db/schema.rb | 39 |
5 files changed, 61 insertions, 25 deletions
diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb index 609589d6b0b..b45338d7938 100644 --- a/app/controllers/merge_requests_controller.rb +++ b/app/controllers/merge_requests_controller.rb @@ -96,19 +96,24 @@ class MergeRequestsController < ApplicationController end def automerge + render_404 unless @merge_request.open? + message = "" + if GitlabMerge.new(@merge_request).merge - @merge_request.update_attributes( - :author_id_of_changes => current_user.id, - :closed => true - ) - @merge_request.reload_code + @merge_request.merge!(current_user.id) message = "Successfully merged" else + @merge_request.mark_as_unmergable message = "Can not be merged" end redirect_to [@merge_request.project, @merge_request], :alert => message + rescue => ex + @merge_request.mark_as_unmergable + message = "Can not be merged" + ensure + redirect_to [@merge_request.project, @merge_request], :alert => message end def destroy diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index edf073d4e88..6d59ce563e1 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -56,6 +56,10 @@ class MergeRequest < ActiveRecord::Base self.reloaded_diffs end + def can_be_merged? + auto_merge + end + def new? today? && created_at == updated_at end @@ -118,6 +122,11 @@ class MergeRequest < ActiveRecord::Base save end + def mark_as_unmergable + self.auto_merge = false + save + end + def reloaded_commits if open? && unmerged_commits.any? self.st_commits = unmerged_commits diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml index ef83b1e49e7..ea46695364c 100644 --- a/app/views/merge_requests/show.html.haml +++ b/app/views/merge_requests/show.html.haml @@ -8,7 +8,6 @@ %span.right - if can?(current_user, :modify_merge_request, @merge_request) - if @merge_request.open? - = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge" = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded", :title => "Close merge request" = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do Edit @@ -53,6 +52,22 @@ Closed by #{@merge_request.closed_event.author_name} %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago. +- if @merge_request.open? && @commits.any? + - if @merge_request.can_be_merged? + .alert-message.block-message.success + %p You can try to merge this request with GitLab. If failed you can always do it manually + .alert-actions + = link_to "Try Merge it!", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small success" + + = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge" + - else + .alert-message.block-message + %p This request cant be merged with GitLab. You should do it manually + .alert-actions + %span.btn.small.disabled Try Merge it! + = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded success", :title => "How To Merge" + + = render "merge_requests/commits" - unless @commits.empty? diff --git a/db/migrate/20120329170745_add_automerge_to_merge_request.rb b/db/migrate/20120329170745_add_automerge_to_merge_request.rb new file mode 100644 index 00000000000..609c3094c8c --- /dev/null +++ b/db/migrate/20120329170745_add_automerge_to_merge_request.rb @@ -0,0 +1,6 @@ +class AddAutomergeToMergeRequest < ActiveRecord::Migration + def change + add_column :merge_requests, :auto_merge, :boolean, :null => false, :default => true + + end +end diff --git a/db/schema.rb b/db/schema.rb index 98993a9ae5e..ff03d504b24 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20120323221339) do +ActiveRecord::Schema.define(:version => 20120329170745) do create_table "events", :force => true do |t| t.string "target_type" @@ -30,8 +30,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do t.integer "assignee_id" t.integer "author_id" t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.boolean "closed", :default => false, :null => false t.integer "position", :default => 0 t.boolean "critical", :default => false, :null => false @@ -43,8 +43,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do create_table "keys", :force => true do |t| t.integer "user_id" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.text "key" t.string "title" t.string "identifier" @@ -59,11 +59,12 @@ ActiveRecord::Schema.define(:version => 20120323221339) do t.integer "assignee_id" t.string "title" t.boolean "closed", :default => false, :null => false - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.text "st_commits" t.text "st_diffs" t.boolean "merged", :default => false, :null => false + t.boolean "auto_merge", :default => true, :null => false end add_index "merge_requests", ["project_id"], :name => "index_merge_requests_on_project_id" @@ -73,8 +74,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do t.string "noteable_id" t.string "noteable_type" t.integer "author_id" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "project_id" t.string "attachment" t.string "line_code" @@ -87,8 +88,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do t.string "name" t.string "path" t.text "description" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.boolean "private_flag", :default => true, :null => false t.string "code" t.integer "owner_id" @@ -111,8 +112,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do t.text "content" t.integer "author_id", :null => false t.integer "project_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "file_name" t.datetime "expires_at" end @@ -145,8 +146,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do t.datetime "last_sign_in_at" t.string "current_sign_in_ip" t.string "last_sign_in_ip" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.string "name" t.boolean "admin", :default => false, :null => false t.integer "projects_limit", :default => 10 @@ -165,16 +166,16 @@ ActiveRecord::Schema.define(:version => 20120323221339) do create_table "users_projects", :force => true do |t| t.integer "user_id", :null => false t.integer "project_id", :null => false - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "project_access", :default => 0, :null => false end create_table "web_hooks", :force => true do |t| t.string "url" t.integer "project_id" - t.datetime "created_at" - t.datetime "updated_at" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false end create_table "wikis", :force => true do |t| |