From 1c9d2e39c1aef8e10ebff6e57c174c197a3a1c93 Mon Sep 17 00:00:00 2001 From: Kirill Zaitsev Date: Mon, 15 Sep 2014 11:10:35 +0400 Subject: Hook attributes --- app/models/merge_request.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'app/models/merge_request.rb') diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 4894c617674..e0358c1889c 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -211,6 +211,20 @@ class MergeRequest < ActiveRecord::Base Gitlab::Satellite::MergeAction.new(current_user, self).format_patch end + def hook_attrs + attrs = { + source: source_project.hook_attrs, + target: target_project.hook_attrs, + last_commit: nil + } + + unless last_commit.nil? + attrs.merge!(last_commit: last_commit.hook_attrs(source_project)) + end + + attributes.merge!(attrs) + end + def for_fork? target_project != source_project end -- cgit v1.2.1 From 9f0083a96c03ec22b1d9442a9c7530899e633301 Mon Sep 17 00:00:00 2001 From: Vinnie Okada Date: Sun, 5 Oct 2014 00:53:44 -0500 Subject: Add task lists to issues and merge requests Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a list item and turn it into a checkbox input. Users who can modify the issue or MR can toggle the checkboxes directly or edit the Markdown to manage the tasks. Task status is also displayed in the MR and issue lists. --- app/models/merge_request.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/models/merge_request.rb') diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index e0358c1889c..7c525b02f48 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -25,6 +25,7 @@ require Rails.root.join("lib/static_model") class MergeRequest < ActiveRecord::Base include Issuable + include Taskable include InternalId belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project" -- cgit v1.2.1