Add support to configure webhook_timeout in gitlab.yaml

Created by: wesgurn

Our Gitlab instance needed the ability to increase the webhook_timeout used by HTTParty. It was hardcoded at 10 and I moved it to a gitlab.yaml file as a config variable

Webhook settings

webhook_timeout: 30 # default: 10 - Number of seconds to wait for HTTP response after sending webhook HTTP POST request

app/models/merge_request.rb

@@ -18,6 +18,7 @@
 #  merge_status      :string(255)
 #  target_project_id :integer          not null
 #  iid               :integer
+#  description       :text
 #
 require Rails.root.join("app/models/commit")
@@ -30,8 +31,7 @@ class MergeRequest < ActiveRecord::Base
   belongs_to :target_project, foreign_key: :target_project_id, class_name: "Project"
   belongs_to :source_project, foreign_key: :source_project_id, class_name: "Project"
-  attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch, :milestone_id, :author_id_of_changes, :state_event
-  attr_mentionable :title
+  attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch, :milestone_id, :author_id_of_changes, :state_event, :description
   attr_accessor :should_remove_source_branch
@@ -222,7 +222,11 @@ class MergeRequest < ActiveRecord::Base
   def mr_and_commit_notes
     commit_ids = commits.map(&:id)
-    Note.where("(noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR (noteable_type = 'Commit' AND commit_id IN (:commit_ids))", mr_id: id, commit_ids: commit_ids)
+    project.notes.where(
+      "(noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR (noteable_type = 'Commit' AND commit_id IN (:commit_ids))",
+      mr_id: id,
+      commit_ids: commit_ids
+    )
   end
   # Returns the raw diff for this merge request