summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2017-02-14 10:51:35 +1100
committerSimon Knox <psimyn@gmail.com>2017-02-14 10:51:35 +1100
commitcea0996ab126f2e8827801cf545691eb7eb6c756 (patch)
tree668d7fb3e200f6db1ca099e14f02b1305bc4560a /changelogs
parent6059fdef5ebdeb8efd592f3c6bbc762d1d2a491f (diff)
parente5f446b7ca4bc54ffaf527e4c57dea2bee2f79f6 (diff)
downloadgitlab-ce-cea0996ab126f2e8827801cf545691eb7eb6c756.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactor
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/27480-deploy_keys_should_not_show_up_in_users_keys_list.yml4
-rw-r--r--changelogs/unreleased/merge-request-tabs-fixture.yml4
-rw-r--r--changelogs/unreleased/quick-submit-fixture.yml4
3 files changed, 12 insertions, 0 deletions
diff --git a/changelogs/unreleased/27480-deploy_keys_should_not_show_up_in_users_keys_list.yml b/changelogs/unreleased/27480-deploy_keys_should_not_show_up_in_users_keys_list.yml
new file mode 100644
index 00000000000..6e9192cb632
--- /dev/null
+++ b/changelogs/unreleased/27480-deploy_keys_should_not_show_up_in_users_keys_list.yml
@@ -0,0 +1,4 @@
+---
+title: Do not display deploy keys in user's own ssh keys list
+merge_request: 9024
+author:
diff --git a/changelogs/unreleased/merge-request-tabs-fixture.yml b/changelogs/unreleased/merge-request-tabs-fixture.yml
new file mode 100644
index 00000000000..289cd7b604a
--- /dev/null
+++ b/changelogs/unreleased/merge-request-tabs-fixture.yml
@@ -0,0 +1,4 @@
+---
+title: Replace static fixture for merge_request_tabs_spec.js
+merge_request: 9172
+author: winniehell
diff --git a/changelogs/unreleased/quick-submit-fixture.yml b/changelogs/unreleased/quick-submit-fixture.yml
new file mode 100644
index 00000000000..a2cf05dabec
--- /dev/null
+++ b/changelogs/unreleased/quick-submit-fixture.yml
@@ -0,0 +1,4 @@
+---
+title: Replace static fixture for behaviors/quick_submit_spec.js
+merge_request: 9086
+author: winniehell