summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-12-06 14:52:50 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-12-06 14:52:50 +0000
commit469dfa43cf794219b5a5508168e762adc5db83ea (patch)
tree4b1f81e9fba145c0a748bf3d26e21230dc1936b4
parentd9ef41cf4dd89716854ef27c4c6cbd93746e426a (diff)
parent2b5a24a8a96bba788db202805cc4f4ec2d278a3f (diff)
downloadgitlab-ce-469dfa43cf794219b5a5508168e762adc5db83ea.tar.gz
Merge branch 'deleted-source-branch-comment' into 'master'
Explain "js: true" in "deleted_source_branch_spec.rb" See merge request !7949
-rw-r--r--spec/features/merge_requests/deleted_source_branch_spec.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/features/merge_requests/deleted_source_branch_spec.rb b/spec/features/merge_requests/deleted_source_branch_spec.rb
index 778b3a90cf3..d5c9ed8a3b7 100644
--- a/spec/features/merge_requests/deleted_source_branch_spec.rb
+++ b/spec/features/merge_requests/deleted_source_branch_spec.rb
@@ -1,5 +1,8 @@
require 'spec_helper'
+# This test serves as a regression test for a bug that caused an error
+# message to be shown by JavaScript when the source branch was deleted.
+# Please do not remove "js: true".
describe 'Deleted source branch', feature: true, js: true do
let(:user) { create(:user) }
let(:merge_request) { create(:merge_request) }