diff options
author | Robert Speicher <robert@gitlab.com> | 2016-08-20 01:29:11 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-08-20 01:29:11 +0000 |
commit | 70cc319b87f7a8c8fa57e5fb577d56c519884dda (patch) | |
tree | 091acc4bff3a178fde0b20622fd805a0e7988d5b /spec/features | |
parent | 0d62f283d6df79b75cdbbf79cce4b8aad9cbc778 (diff) | |
parent | 97dddf39cd98d49f02b9adae3b7aeb3b28c434a6 (diff) | |
download | gitlab-ce-70cc319b87f7a8c8fa57e5fb577d56c519884dda.tar.gz |
Merge branch 'disable-issue-by-email' into 'master'
Disable “issue by email” feature until it uses a different token
Separate token being worked on in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5914, but too late for 8.11.
See merge request !5915
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/issues_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb index cb445e22af0..2e595959f04 100644 --- a/spec/features/issues_spec.rb +++ b/spec/features/issues_spec.rb @@ -525,7 +525,7 @@ describe 'Issues', feature: true do end end - describe 'new issue by email' do + xdescribe 'new issue by email' do shared_examples 'show the email in the modal' do before do stub_incoming_email_setting(enabled: true, address: "p+%{key}@gl.ab") |