Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormicael.bergeron <micaelbergeron@gmail.com>2017-11-20 17:02:01 +0300
committermicael.bergeron <micaelbergeron@gmail.com>2017-12-07 17:01:27 +0300
commit3d8fbd12b8f234aa62f4b5ceed21076a7afbcd23 (patch)
tree605b07654f65bb07c34b6d88a77b57f9b4b0b229 /app/models
parent6b3f0fee151283348b44a69342ec1a6738cd2de0 (diff)
add support for commit (in mr) to reference filter
Diffstat (limited to 'app/models')
-rw-r--r--app/models/merge_request.rb9
-rw-r--r--app/models/note.rb4
2 files changed, 13 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 949d42f865c..d60b9fb6b2d 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1021,4 +1021,13 @@ class MergeRequest < ActiveRecord::Base
project.merge_requests.merged.where(author_id: author_id).empty?
end
+
+ def banzai_render_context(field)
+ # this will be used to reference these commit in the context of the MR
+ # the URL are built differently
+ {
+ merge_request: self,
+ mr_commit_shas: all_commit_shas
+ }
+ end
end
diff --git a/app/models/note.rb b/app/models/note.rb
index 1357e75d907..fb4a52f8c6e 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -405,6 +405,10 @@ class Note < ActiveRecord::Base
noteable_object&.touch
end
+ def banzai_render_context(field)
+ super.merge(noteable: noteable)
+ end
+
private
def keep_around_commit