summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-04-07 20:03:55 -0500
committerDouwe Maan <douwe@selenight.nl>2017-04-07 20:03:55 -0500
commitf058b52b50c76de9557b167a1a31a5c9ba446f31 (patch)
tree047f04c2b0ed83ed71a6b39e64f55c40eded838b /changelogs
parent130a1e86e215d5d43cd3c53a44589aa5b8c69aab (diff)
parent7d3f37b0b879af562dc7c499bdbfcb230ed718a4 (diff)
downloadgitlab-ce-f058b52b50c76de9557b167a1a31a5c9ba446f31.tar.gz
Merge branch 'master' into new-resolvable-discussion
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/30588-fix-javascript-sourcemaps-w-chrome-breakpoints.yml4
-rw-r--r--changelogs/unreleased/adam-finish-5993-closed-issuable.yml4
2 files changed, 8 insertions, 0 deletions
diff --git a/changelogs/unreleased/30588-fix-javascript-sourcemaps-w-chrome-breakpoints.yml b/changelogs/unreleased/30588-fix-javascript-sourcemaps-w-chrome-breakpoints.yml
new file mode 100644
index 00000000000..9cff3c2776f
--- /dev/null
+++ b/changelogs/unreleased/30588-fix-javascript-sourcemaps-w-chrome-breakpoints.yml
@@ -0,0 +1,4 @@
+---
+title: Upgrade webpack to v2.3.3 and webpack-dev-server to v2.4.2
+merge_request: 10552
+author:
diff --git a/changelogs/unreleased/adam-finish-5993-closed-issuable.yml b/changelogs/unreleased/adam-finish-5993-closed-issuable.yml
new file mode 100644
index 00000000000..b324566313f
--- /dev/null
+++ b/changelogs/unreleased/adam-finish-5993-closed-issuable.yml
@@ -0,0 +1,4 @@
+---
+title: Add indication for closed or merged issuables in GFM
+merge_request: 9462
+author: Adam Buckland