Add latest changes from gitlab-org/gitlab@master

2 files changed, 24 insertions, 3 deletions

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index cfc4075100b..6cc9959dcb9 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -164,8 +164,8 @@ module LabelsHelper
   end
 
   def label_subscription_status(label, project)
-    return 'group-level' if label.subscribed?(current_user)
-    return 'project-level' if label.subscribed?(current_user, project)
+    return 'group-level' if label.lazy_subscribed?(current_user)
+    return 'project-level' if label.lazy_subscribed?(current_user, project)
 
     'unsubscribed'
   end
@@ -181,7 +181,7 @@ module LabelsHelper
   end
 
   def label_subscription_toggle_button_text(label, project = nil)
-    label.subscribed?(current_user, project) ? 'Unsubscribe' : 'Subscribe'
+    label.lazy_subscribed?(current_user, project) ? 'Unsubscribe' : 'Subscribe'
   end
 
   def create_label_title(subject)
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 376dde9d612..ecb5a7a9071 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -185,6 +185,27 @@ module MergeRequestsHelper
     end
   end
 
+  def diffs_tab_pane_data(project, merge_request, params)
+    {
+      "is-locked": merge_request.discussion_locked?,
+      endpoint: diffs_project_merge_request_path(project, merge_request, 'json', params),
+      endpoint_metadata: @endpoint_metadata_url,
+      endpoint_batch: diffs_batch_project_json_merge_request_path(project, merge_request, 'json', params),
+      endpoint_coverage: @coverage_path,
+      help_page_path: help_page_path('user/discussions/index.md', anchor: 'suggest-changes'),
+      current_user_data: @current_user_data,
+      update_current_user_path: @update_current_user_path,
+      project_path: project_path(merge_request.project),
+      changes_empty_state_illustration: image_path('illustrations/merge_request_changes_empty.svg'),
+      is_fluid_layout: fluid_layout.to_s,
+      dismiss_endpoint: user_callouts_path,
+      show_suggest_popover: show_suggest_popover?.to_s,
+      show_whitespace_default: @show_whitespace_default.to_s,
+      file_by_file_default: @file_by_file_default.to_s,
+      default_suggestion_commit_message: default_suggestion_commit_message
+    }
+  end
+
   private
 
   def review_requested_merge_requests_count