Merge branch '42877-for-10-5-stable-patch-4' into '10-5-stable-patch-4'

Fix snippets problem in 10-5-stable-patch-4 See merge request gitlab-org/gitlab-ce!17610

Merge branch '42877-for-10-5-stable-patch-4' into '10-5-stable-patch-4'
517b9705 · Ian Baum · 790bcf70 · ecf1af65 · 517b9705
Commit 517b9705 authored Mar 07, 2018 by Ian Baum
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

snippets_finder.rb app/finders/snippets_finder.rb +0 -3

No files found.
--- a/app/finders/snippets_finder.rb
+++ b/app/finders/snippets_finder.rb
@@ -82,9 +82,6 @@ class SnippetsFinder < UnionFinder
  end

  def feature_available_projects
-    # Don't return any project related snippets if the user cannot read cross project
-    return table[:id].eq(nil) unless Ability.allowed?(current_user, :read_cross_project)
-
    projects = projects_for_user do |part|
      part.with_feature_available_for_user(:snippets, current_user)
    end.select(:id)