summaryrefslogtreecommitdiff
path: root/changelogs/unreleased/fix-sm-34547-cannot-connect-to-ci-server-error-messages.yml
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-08-17 14:01:31 +0200
committerDouwe Maan <douwe@selenight.nl>2017-08-17 14:01:31 +0200
commit834f1b30d50dc3ad9d0f6ff81cef24dc6ebc375c (patch)
treee5f2e714e695d995649942111f29d4e857b33a67 /changelogs/unreleased/fix-sm-34547-cannot-connect-to-ci-server-error-messages.yml
parent6aeb99c98bee304c5010a1173c47777eff1e04a5 (diff)
parentfe0ffcc78941bf9de98e3698e743c3cbb9846b6a (diff)
downloadgitlab-ce-834f1b30d50dc3ad9d0f6ff81cef24dc6ebc375c.tar.gz
Merge branch 'master' into issue-discussions-refactor
# Conflicts: # package.json # spec/support/features/reportable_note_shared_examples.rb
Diffstat (limited to 'changelogs/unreleased/fix-sm-34547-cannot-connect-to-ci-server-error-messages.yml')
-rw-r--r--changelogs/unreleased/fix-sm-34547-cannot-connect-to-ci-server-error-messages.yml5
1 files changed, 0 insertions, 5 deletions
diff --git a/changelogs/unreleased/fix-sm-34547-cannot-connect-to-ci-server-error-messages.yml b/changelogs/unreleased/fix-sm-34547-cannot-connect-to-ci-server-error-messages.yml
deleted file mode 100644
index ddaec4f19f9..00000000000
--- a/changelogs/unreleased/fix-sm-34547-cannot-connect-to-ci-server-error-messages.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix an order of operations for CI connection error message in merge request
- widget
-merge_request: 13252
-author: