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

3 files changed, 5 insertions, 1 deletions

diff --git a/spec/features/projects/environments_pod_logs_spec.rb b/spec/features/projects/environments_pod_logs_spec.rb
index 2b2327940a5..a51f121bf59 100644
--- a/spec/features/projects/environments_pod_logs_spec.rb
+++ b/spec/features/projects/environments_pod_logs_spec.rb
@@ -57,7 +57,9 @@ describe 'Environment > Pod Logs', :js do
           expect(item.text).to eq(pod_names[i])
         end
       end
-      expect(page).to have_content("Dec 13 14:04:22.123Z | kube-pod | Log 1 Dec 13 14:04:23.123Z | kube-pod | Log 2 Dec 13 14:04:24.123Z | kube-pod | Log 3")
+      expect(page).to have_content("kube-pod | Log 1")
+      expect(page).to have_content("kube-pod | Log 2")
+      expect(page).to have_content("kube-pod | Log 3")
     end
   end
 end
diff --git a/spec/features/projects/snippets/create_snippet_spec.rb b/spec/features/projects/snippets/create_snippet_spec.rb
index b55a42e07a9..d883a1fc39c 100644
--- a/spec/features/projects/snippets/create_snippet_spec.rb
+++ b/spec/features/projects/snippets/create_snippet_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 shared_examples_for 'snippet editor' do
   before do
+    stub_feature_flags(snippets_edit_vue: false)
     stub_feature_flags(monaco_snippets: flag)
   end
 
diff --git a/spec/features/projects/snippets/user_updates_snippet_spec.rb b/spec/features/projects/snippets/user_updates_snippet_spec.rb
index bad3fde8a4a..cf501e55e23 100644
--- a/spec/features/projects/snippets/user_updates_snippet_spec.rb
+++ b/spec/features/projects/snippets/user_updates_snippet_spec.rb
@@ -11,6 +11,7 @@ describe 'Projects > Snippets > User updates a snippet', :js do
 
   before do
     stub_feature_flags(snippets_vue: false)
+    stub_feature_flags(snippets_edit_vue: false)
     stub_feature_flags(version_snippets: version_snippet_enabled)
 
     project.add_maintainer(user)