Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 19 deletions

diff --git a/spec/views/projects/edit.html.haml_spec.rb b/spec/views/projects/edit.html.haml_spec.rb
index 77336aa7d86..8c1a8cf21d0 100644
--- a/spec/views/projects/edit.html.haml_spec.rb
+++ b/spec/views/projects/edit.html.haml_spec.rb
@@ -105,26 +105,10 @@ RSpec.describe 'projects/edit' do
   end
 
   describe 'pages menu entry callout' do
-    context 'with feature flag disabled' do
-      before do
-        stub_feature_flags(show_pages_in_deployments_menu: false)
-      end
-
-      it 'does not show a callout' do
-        render
-        expect(rendered).not_to have_content('GitLab Pages has moved')
-      end
-    end
-
-    context 'with feature flag enabled' do
-      before do
-        stub_feature_flags(show_pages_in_deployments_menu: true)
-      end
+    it 'does show a callout' do
+      render
 
-      it 'does show a callout' do
-        render
-        expect(rendered).to have_content('GitLab Pages has moved')
-      end
+      expect(rendered).to have_content(_('GitLab Pages has moved'))
     end
   end
 end