Add support to configure webhook_timeout in gitlab.yaml
Compare changes
Files
6- Jacob Vosmaer (GitLab) authored
+ 7
− 3
@@ -18,6 +18,7 @@
@@ -18,6 +18,7 @@
@@ -30,8 +31,7 @@ class MergeRequest < ActiveRecord::Base
@@ -30,8 +31,7 @@ class MergeRequest < ActiveRecord::Base
attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch, :milestone_id, :author_id_of_changes, :state_event
@@ -222,7 +222,11 @@ class MergeRequest < ActiveRecord::Base
@@ -222,7 +222,11 @@ class MergeRequest < ActiveRecord::Base
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)