Rename variable

merge_request_for_resolving_discussions ->
merge_request_to_resolve_discussions_of

3 files changed, 14 insertions, 14 deletions

diff --git a/app/services/issues/build_service.rb b/app/services/issues/build_service.rb
index 3d4b6b055c4..510b32a77ab 100644
--- a/app/services/issues/build_service.rb
+++ b/app/services/issues/build_service.rb
@@ -8,23 +8,23 @@ module Issues
     end
 
     def issue_params_with_info_from_discussions
-      return {} unless merge_request_for_resolving_discussions
+      return {} unless merge_request_to_resolve_discussions_of
 
       { title: title_from_merge_request, description: description_for_discussions }
     end
 
     def title_from_merge_request
-      "Follow-up from \"#{merge_request_for_resolving_discussions.title}\""
+      "Follow-up from \"#{merge_request_to_resolve_discussions_of.title}\""
     end
 
     def description_for_discussions
       if discussions_to_resolve.empty?
         return "There are no unresolved discussions. "\
-               "Review the conversation in #{merge_request_for_resolving_discussions.to_reference}"
+               "Review the conversation in #{merge_request_to_resolve_discussions_of.to_reference}"
       end
 
       description = "The following #{'discussion'.pluralize(discussions_to_resolve.size)} "\
-                    "from #{merge_request_for_resolving_discussions.to_reference} "\
+                    "from #{merge_request_to_resolve_discussions_of.to_reference} "\
                     "should be addressed:"
 
       [description, *items_for_discussions].join("\n\n")
diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb
index 175312aed91..3cf4b82b9f2 100644
--- a/app/services/issues/create_service.rb
+++ b/app/services/issues/create_service.rb
@@ -29,7 +29,7 @@ module Issues
       return if discussions_to_resolve.empty?
 
       Discussions::ResolveService.new(project, current_user,
-                                      merge_request: merge_request_for_resolving_discussions,
+                                      merge_request: merge_request_to_resolve_discussions_of,
                                       follow_up_issue: issue).
         execute(discussions_to_resolve)
     end
diff --git a/app/services/issues/resolve_discussions.rb b/app/services/issues/resolve_discussions.rb
index 89105dceb5f..297c7d696c3 100644
--- a/app/services/issues/resolve_discussions.rb
+++ b/app/services/issues/resolve_discussions.rb
@@ -1,30 +1,30 @@
 module Issues
   module ResolveDiscussions
-    attr_reader :merge_request_for_resolving_discussions_iid, :discussion_to_resolve_id
+    attr_reader :merge_request_to_resolve_discussions_of_iid, :discussion_to_resolve_id
 
     def filter_resolve_discussion_params
-      @merge_request_for_resolving_discussions_iid ||= params.delete(:merge_request_for_resolving_discussions)
+      @merge_request_to_resolve_discussions_of_iid ||= params.delete(:merge_request_to_resolve_discussions_of)
       @discussion_to_resolve_id ||= params.delete(:discussion_to_resolve)
     end
 
-    def merge_request_for_resolving_discussions
-      return @merge_request_for_resolving_discussions if defined?(@merge_request_for_resolving_discussions)
+    def merge_request_to_resolve_discussions_of
+      return @merge_request_to_resolve_discussions_of if defined?(@merge_request_to_resolve_discussions_of)
 
-      @merge_request_for_resolving_discussions = MergeRequestsFinder.new(current_user, project_id: project.id).
+      @merge_request_to_resolve_discussions_of = MergeRequestsFinder.new(current_user, project_id: project.id).
                                                      execute.
-                                                     find_by(iid: merge_request_for_resolving_discussions_iid)
+                                                     find_by(iid: merge_request_to_resolve_discussions_of_iid)
     end
 
     def discussions_to_resolve
-      return [] unless merge_request_for_resolving_discussions
+      return [] unless merge_request_to_resolve_discussions_of
 
       @discussions_to_resolve ||=
         if discussion_to_resolve_id
-          discussion_or_nil = merge_request_for_resolving_discussions
+          discussion_or_nil = merge_request_to_resolve_discussions_of
                                 .find_diff_discussion(discussion_to_resolve_id)
           Array(discussion_or_nil)
         else
-          merge_request_for_resolving_discussions
+          merge_request_to_resolve_discussions_of
             .resolvable_discussions
         end
     end