diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-03-26 22:33:25 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-03-26 22:33:25 +0000 |
| commit | 535bd5743f932c3ab30e047929b32c3ade2f47e5 (patch) | |
| tree | b183407b2bf08d8c9b3c75a6b9882c37b8517701 /spec/features | |
| parent | 81fe9e9b2e670cc7dcd9405e336f72cabc5a14ba (diff) | |
| parent | dc14af6b53d67b2be4b9d9edf3a2122acec6f061 (diff) | |
| download | gitlab-ce-535bd5743f932c3ab30e047929b32c3ade2f47e5.tar.gz | |
Merge branch '48132-display-output-from-pre-receive-scripts' into 'master'
Allow custom hooks errors to appear in GitLab UI
Closes #48132
See merge request gitlab-org/gitlab-ce!25625
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/tags/master_deletes_tag_spec.rb | 2 |
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 |