summaryrefslogtreecommitdiff
path: root/lib/api/notes.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-09-05 15:33:33 +0000
committerRémy Coutable <remy@rymai.me>2016-09-05 15:33:33 +0000
commit553180e1c87664aae3efba01c30a345a1a2a2a00 (patch)
tree1dece50fb5623d8d74bf0b79f537332ea850ab45 /lib/api/notes.rb
parent8aa025bb85cab3070a876b43d9c5462af5f35e67 (diff)
parent9dff647a7bc181706d1e9d46d1ebfd5fb964dcf7 (diff)
downloadgitlab-ce-553180e1c87664aae3efba01c30a345a1a2a2a00.tar.gz
Merge branch 'fix-changelog' into 'master'
Move CHANGELOG entries of !5361, !5451 and !5887 from 8.11 to 8.12 ## What does this MR do? Move CHANGELOG entries of !5361, !5451 and !5887 from 8.11 to 8.12 ## Why was this MR needed? They were wrongly added to 8.11 here: - https://gitlab.com/gitlab-org/gitlab-ce/commit/220755f52ad6e3fdfa43c62e0a4a4051721246dc#note_14900001 - https://gitlab.com/gitlab-org/gitlab-ce/commit/87f93ceb9542c415d6c23c72ff93d63272107d54 See merge request !6189
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions