Add latest changes from gitlab-org/gitlab@12-0-stable-ee

a21e4112 · GitLab Bot · 96b52080 · a21e4112 · a21e4112 · a21e4112
Commit a21e4112 authored 5 years ago by GitLab Bot
--- a/spec/support/helpers/stub_object_storage.rb
+++ b/spec/support/helpers/stub_object_storage.rb
--- a/spec/support/helpers/test_env.rb
+++ b/spec/support/helpers/test_env.rb
--- a/spec/support/matchers/markdown_matchers.rb
+++ b/spec/support/matchers/markdown_matchers.rb
--- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
+++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
--- a/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/creations/_new_submit.html.haml_spec.rb
--- a/spec/views/projects/merge_requests/edit.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/edit.html.haml_spec.rb
--- a/spec/views/shared/_clone_panel.html.haml_spec.rb
+++ b/spec/views/shared/_clone_panel.html.haml_spec.rb
--- a/spec/views/shared/_label_row.html.haml.rb
+++ b/spec/views/shared/_label_row.html.haml.rb
--- a/vendor/assets/javascripts/snowplow/sp.js
+++ b/vendor/assets/javascripts/snowplow/sp.js