summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorLuke Duncalfe <lduncalfe@eml.cc>2019-03-20 17:08:51 +1300
committerLuke Duncalfe <lduncalfe@eml.cc>2019-03-26 13:05:40 +1300
commitf82380b9df9693e7976b7474233840a469635429 (patch)
tree0b692684c7b5933d3df6076ec5b9c9e772dd6a50 /spec/features
parenta3b3da72775fd37f7533ddd88fe47600079b4ed9 (diff)
downloadgitlab-ce-f82380b9df9693e7976b7474233840a469635429.tar.gz
Allow custom hooks errors to appear in GitLab UI
Error messages from custom pre-receive hooks now appear in the GitLab UI. This is re-enabling a feature that had been disabled in merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18646 The feature had been disabled due to security concerns that information which was not intended to be public (like stack traces) would leak into public view. PreReceiveErrors (from pre-receive, post-receive and update custom hooks) are now filtered for messages that have been prefixed in a particular way. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48132
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/tags/master_deletes_tag_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/tags/master_deletes_tag_spec.rb b/spec/features/tags/master_deletes_tag_spec.rb
index 8d567e925ef..bdbbe645779 100644
--- a/spec/features/tags/master_deletes_tag_spec.rb
+++ b/spec/features/tags/master_deletes_tag_spec.rb
@@ -37,7 +37,7 @@ describe 'Maintainer deletes tag' do
context 'when pre-receive hook fails', :js do
before do
allow_any_instance_of(Gitlab::GitalyClient::OperationService).to receive(:rm_tag)
- .and_raise(Gitlab::Git::PreReceiveError, 'Do not delete tags')
+ .and_raise(Gitlab::Git::PreReceiveError, 'GitLab: Do not delete tags')
end
it 'shows the error message' do