Merge branch 'master' into 24339-job-page24339-job-page

* master: (190 commits)
  Replaced duplicate z-index with index of 400
  Enable RSpec profiling only if RSPEC_PROFILING_POSTGRES_URL is not empty
  Add descriptions for the RSpec/EmptyExampleGroup and RSpec/ExpectOutput cops
  Add note about artifacts previewing in docs
  MRWidget: Make error message bold and red.
  Fixes the 500 for custom apearance header logo and logo
  MRWidget: Change refresh button place in failed state.
  Remove readme project_view option
  Update prometheus documentation
  Fix JavaScript translations that are using a namespace
  MRWidget: Add refresh button into MR widget failed state.
  Add s selectors for supported avatars.
  Render plain README using Markup viewer so it is displayed below tree
  Add docs on how to turn off SSL verification on GH oauth
  Fix clicking disabled clipboard button toolip
  Stop MR conflict code from blowing up when branches are missing
  Update edit.html.haml Closes #32555
  Fixes per feedback on user avatar components.
  Consolidate user avatar Vue logic
  Fixes for the rename reserved paths helpers
  ...

1 files changed, 19 insertions, 4 deletions

diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index eb37f2e0267..622e14e21ff 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -226,7 +226,7 @@ module BlobHelper
 
   def open_raw_blob_button(blob)
     return if blob.empty?
-    
+
     if blob.raw_binary? || blob.stored_externally?
       icon = icon('download')
       title = 'Download'
@@ -242,9 +242,9 @@ module BlobHelper
     case viewer.render_error
     when :too_large
       max_size =
-        if viewer.absolutely_too_large?
-          viewer.absolute_max_size
-        elsif viewer.too_large?
+        if viewer.can_override_max_size?
+          viewer.overridable_max_size
+        else
           viewer.max_size
         end
       "it is larger than #{number_to_human_size(max_size)}"
@@ -278,4 +278,19 @@ module BlobHelper
 
     options
   end
+
+  def contribution_options(project)
+    options = []
+
+    if can?(current_user, :create_issue, project)
+      options << link_to("submit an issue", new_namespace_project_issue_path(project.namespace, project))
+    end
+
+    merge_project = can?(current_user, :create_merge_request, project) ? project : (current_user && current_user.fork_of(project))
+    if merge_project
+      options << link_to("create a merge request", new_namespace_project_merge_request_path(project.namespace, project))
+    end
+
+    options
+  end
 end