summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-10-28 13:09:51 +0100
committerRobert Speicher <rspeicher@gmail.com>2015-11-04 10:36:06 -0500
commit0eb0a6090f00e8d4b7e6d94d947eb710c0013a89 (patch)
tree2ef4d07a69f5e540220f9138800afdc43171ec57
parent52994bb915510f7f91008097d7f8bdb3c6cd2670 (diff)
downloadgitlab-ce-0eb0a6090f00e8d4b7e6d94d947eb710c0013a89.tar.gz
Use issue editor as cross reference comment author when issue is edited with a new mention.
-rw-r--r--CHANGELOG13
-rw-r--r--app/services/issues/update_service.rb2
-rw-r--r--app/services/merge_requests/update_service.rb2
-rw-r--r--app/services/notes/update_service.rb2
4 files changed, 16 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 797ee2614f7..a31cf1919d3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,19 @@ v 8.1.3
v 8.1.2
v 8.1.3
- Spread out runner contacted_at updates
+v 8.2.0 (unreleased)
+ - Improved performance of replacing references in comments
+ - Show last project commit to default branch on project home page
+ - Highlight comment based on anchor in URL
+ - Adds ability to remove the forked relationship from project settings screen. (Han Loong Liauw)
+ - Improved performance of sorting milestone issues
+ - Allow users to select the Files view as default project view (Cristian Bica)
+ - Show "Empty Repository Page" for repository without branches (Artem V. Navrotskiy)
+ - Fix: Inability to reply to code comments in the MR view, if the MR comes from a fork
+ - Use git follow flag for commits page when retrieve history for file or directory
+ - Show merge request CI status on merge requests index page
+ - Fix: 500 error returned if destroy request without HTTP referer (Kazuki Shimizu)
+ - Use issue editor as cross reference comment author when issue is edited with a new mention.
v 8.1.1
- Fix cloning Wiki repositories via HTTP (Stan Hu)
diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb
index 2b5426ad452..551325e4cab 100644
--- a/app/services/issues/update_service.rb
+++ b/app/services/issues/update_service.rb
@@ -35,7 +35,7 @@ module Issues
create_title_change_note(issue, issue.previous_changes['title'].first)
end
- issue.create_new_cross_references!
+ issue.create_new_cross_references!(current_user)
execute_hooks(issue, 'update')
end
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb
index ebbe0af803b..61f7d2bbe89 100644
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
@@ -59,7 +59,7 @@ module MergeRequests
merge_request.mark_as_unchecked
end
- merge_request.create_new_cross_references!
+ merge_request.create_new_cross_references!(current_user)
execute_hooks(merge_request, 'update')
end
diff --git a/app/services/notes/update_service.rb b/app/services/notes/update_service.rb
index 6c2f08e5963..72e2f78008d 100644
--- a/app/services/notes/update_service.rb
+++ b/app/services/notes/update_service.rb
@@ -4,7 +4,7 @@ module Notes
return note unless note.editable?
note.update_attributes(params.merge(updated_by: current_user))
- note.create_new_cross_references!
+ note.create_new_cross_references!(current_user)
note.reset_events_cache
note