Add latest changes from gitlab-org/gitlab@master

spec/helpers/application_helper_spec.rb

@@ -471,7 +471,7 @@ RSpec.describe ApplicationHelper do
 
     context 'when @snippet is set' do
       it 'returns the passed path' do
-        snippet = create(:snippet)
+        snippet = create(:project_snippet)
         assign(:snippet, snippet)
 
         expect(helper.external_storage_url_or_path('/foo/bar', project)).to eq('/foo/bar')