kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/services/merge_requests
History
Douwe Maan 579951720a Merge branch 'diff-line-comment-vuejs' into 'master' 
Diff line comments resolve

## What does this MR do?

Diff line comments can be resolved.

Part of #10325 

To do:

- [x] Backend (@DouweM)
  - [x] Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13319326. Will be made easier by https://gitlab.com/gitlab-org/gitlab-ce/issues/17237#note_13370331
  - [x] System note when all discussions are resolved
  - [x] Notification when all discussions are resolved
  - [x] Write unit tests
  - [x] Look at resolve time https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13912743 - Fixed by 4a13aa9
- [x] Frontend (@iamphill)
  - [x] Fix bugs
  - [x] Write more feature tests 
- [x] Frontend (@connorshea)
  - [x] Address frontend feedback
  - [x] Feature specs for Jump feature
  - [x] Documentation
  - [x] Add Vue.js in a standard way

See merge request !5022
 		2016-08-19 02:24:34 +00:00
..
add_todo_when_build_fails_service.rb
…
base_service.rb webhooks: include old revision in MR update events 2016-08-01 11:20:07 -04:00
build_service.rb Introduce Compare model in the codebase. 2016-08-03 07:00:20 +02:00
close_service.rb Enforce permissions in `{Issues,MergeRequests}::{Close,Reopen}Service` 2016-08-13 00:06:11 +02:00
create_service.rb Fix specs and implement fixes based on failing specs 2016-08-17 17:54:24 -05:00
get_urls_service.rb Don't show new MR URL after push when it doesn't make sense 2016-08-12 17:51:54 -05:00
merge_request_diff_cache_service.rb switch from diff_file_collection to diffs 2016-08-03 07:00:20 +02:00
merge_service.rb Properly abort a merge when merge conflicts occur 2016-07-29 11:21:21 -07:00
merge_when_build_succeeds_service.rb Rename MergeRequest methods that return commits or shas to be more clear and consistent 2016-07-06 18:50:58 -04:00
post_merge_service.rb
…
refresh_service.rb webhooks: include old revision in MR update events 2016-08-01 11:20:07 -04:00
reopen_service.rb Enforce permissions in `{Issues,MergeRequests}::{Close,Reopen}Service` 2016-08-13 00:06:11 +02:00
resolve_service.rb Move resolving code to ResolveService 2016-08-12 23:24:48 +03:00
resolved_discussion_notification_service.rb Address review feedback 2016-08-16 11:04:26 -05:00
update_service.rb Add notifications for new user mentions in merge requests 2016-08-15 14:47:16 +01:00