Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc41

2 files changed, 15 insertions, 2 deletions

diff --git a/spec/helpers/projects/project_members_helper_spec.rb b/spec/helpers/projects/project_members_helper_spec.rb
index 5e0b4df7f7f..1a55840a58a 100644
--- a/spec/helpers/projects/project_members_helper_spec.rb
+++ b/spec/helpers/projects/project_members_helper_spec.rb
@@ -166,7 +166,7 @@ RSpec.describe Projects::ProjectMembersHelper do
           members: helper.project_members_data_json(project, present_members(project_members)),
           member_path: '/foo-bar/-/project_members/:id',
           source_id: project.id,
-          can_manage_members: true
+          can_manage_members: 'true'
         })
       end
     end
@@ -193,7 +193,7 @@ RSpec.describe Projects::ProjectMembersHelper do
           members: helper.project_group_links_data_json(project_group_links),
           member_path: '/foo-bar/-/group_links/:id',
           source_id: project.id,
-          can_manage_members: true
+          can_manage_members: 'true'
         })
       end
     end
diff --git a/spec/helpers/projects/security/configuration_helper_spec.rb b/spec/helpers/projects/security/configuration_helper_spec.rb
new file mode 100644
index 00000000000..c5049bd87f0
--- /dev/null
+++ b/spec/helpers/projects/security/configuration_helper_spec.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Projects::Security::ConfigurationHelper do
+  let(:current_user) { create(:user) }
+
+  describe 'security_upgrade_path' do
+    subject { security_upgrade_path }
+
+    it { is_expected.to eq('https://about.gitlab.com/pricing/') }
+  end
+end