Douwe Maan
f23b1cb453
Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'
...
Replace MR access checks with use of MergeRequestsFinder
Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867
⚠️ - Potentially untested
💣 - No test coverage
🚥 - Test coverage of some sort exists (a test failed when error raised)
🚦 - Test coverage of return value (a test failed when nil used)
✅ - Permissions check tested
- [x] 💣 app/finders/notes_finder.rb:17
- [x] ⚠️ app/views/layouts/nav/_project.html.haml:80 [`.count`]
- [x] 💣 app/controllers/concerns/creates_commit.rb:84
- [x] 🚥 app/controllers/projects/commits_controller.rb:24
- [x] 🚥 app/controllers/projects/compare_controller.rb:56
- [x] 🚦 app/controllers/projects/discussions_controller.rb:29
- [x] ✅ app/controllers/projects/todos_controller.rb:27
- [x] 🚦 app/models/commit.rb:268
- [x] ✅ lib/gitlab/search_results.rb:71
- [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_267_266 Memoize ` merged_merge_request(current_user)`
- [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_248_247 Expected side effect for `merged_merge_request!`, consider `skip_authorization: true`.
- [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_269_269 Scary use of unchecked `merged_merge_request?`
See merge request !2033
2016-12-08 21:42:07 -03:00
Bob Van Landuyt
1123057ab7
Feature: delegate all open discussions to Issue
...
When a merge request can only be merged when all discussions are
resolved. This feature allows to easily delegate those discussions to a
new issue, while marking them as resolved in the merge request.
The user is presented with a new issue, prepared with mentions of all
unresolved discussions, including the first unresolved note of the
discussion, time and link to the note.
When the issue is created, the discussions in the merge request will get
a system note directing the user to the newly created issue.
2016-12-05 20:55:45 +01:00
Felipe Artur
892dea6771
Project tools visibility level
2016-09-01 11:47:59 -03:00
Douwe Maan
4a13aa9f34
Store discussion_id on Note for faster discussion lookup.
2016-08-17 12:16:46 -05:00
Douwe Maan
41007f6d3c
Address review feedback
2016-08-16 11:04:26 -05:00
Douwe Maan
e257200459
Add specs for NotesController and DiscussionsController
2016-08-12 16:24:09 -05:00
Douwe Maan
fa4a613517
Add 'Resolved all discussions' system note
2016-07-28 20:39:35 -06:00
Douwe Maan
1c2eefef3f
Backend tweaks
2016-07-28 20:09:36 -06:00
Phil Hughes
2247d8a4fd
Updates the text above discussions when resolving notes & discussions
2016-07-27 18:34:04 +01:00
Phil Hughes
a678fef836
Added resolved by users name into tooltip
2016-07-26 15:47:19 +01:00
Douwe Maan
eeb41c759e
Add endpoints to resolve diff notes and discussions
2016-07-25 22:45:23 -06:00
