Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 2 deletions

diff --git a/spec/helpers/graph_helper_spec.rb b/spec/helpers/graph_helper_spec.rb
index 3c7e4f970c3..682f6365481 100644
--- a/spec/helpers/graph_helper_spec.rb
+++ b/spec/helpers/graph_helper_spec.rb
@@ -15,4 +15,16 @@ RSpec.describe GraphHelper do
       expect(refs).to match('master')
     end
   end
+
+  describe '#should_render_deployment_frequency_charts' do
+    let(:project) { create(:project, :private) }
+
+    before do
+      self.instance_variable_set(:@project, project)
+    end
+
+    it 'always returns false' do
+      expect(should_render_deployment_frequency_charts).to be(false)
+    end
+  end
 end
diff --git a/spec/helpers/tree_helper_spec.rb b/spec/helpers/tree_helper_spec.rb
index 136ec07e73d..6cb9894e306 100644
--- a/spec/helpers/tree_helper_spec.rb
+++ b/spec/helpers/tree_helper_spec.rb
@@ -330,9 +330,8 @@ RSpec.describe TreeHelper do
       end
     end
 
-    context 'gitpod feature is enabled' do
+    context 'gitpod settings is enabled' do
       before do
-        stub_feature_flags(gitpod: true)
         allow(Gitlab::CurrentSettings)
           .to receive(:gitpod_enabled)
           .and_return(true)