summaryrefslogtreecommitdiff
path: root/spec/helpers
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-08-29 21:33:45 +0000
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-08-29 21:33:45 +0000
commitdf556bf2f6a49790803386149d817252f6363b7a (patch)
tree2071b85cb797aba976cef5debc22d775641e9b91 /spec/helpers
parent15b88fe57faff899b76d24e41985d83612c7de3a (diff)
parent4daf3dc0dba8be985ee7d7e3e331e0468d5a72ad (diff)
downloadgitlab-ce-df556bf2f6a49790803386149d817252f6363b7a.tar.gz
Merge branch 'security-exposed-default-branch' into 'master'
Avoid exposing unaccessible repo data upon GFM post processing See merge request gitlab/gitlabhq!3344
Diffstat (limited to 'spec/helpers')
-rw-r--r--spec/helpers/markup_helper_spec.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/helpers/markup_helper_spec.rb b/spec/helpers/markup_helper_spec.rb
index f6e1720e113..1757ec8fa4d 100644
--- a/spec/helpers/markup_helper_spec.rb
+++ b/spec/helpers/markup_helper_spec.rb
@@ -65,6 +65,9 @@ describe MarkupHelper do
describe 'inside a group' do
before do
+ # Ensure the generated reference links aren't redacted
+ group.add_maintainer(user)
+
helper.instance_variable_set(:@group, group)
helper.instance_variable_set(:@project, nil)
end
@@ -78,6 +81,9 @@ describe MarkupHelper do
let(:project_in_group) { create(:project, group: group) }
before do
+ # Ensure the generated reference links aren't redacted
+ project_in_group.add_maintainer(user)
+
helper.instance_variable_set(:@group, group)
helper.instance_variable_set(:@project, project_in_group)
end