5c763ac4c6
Add latest changes from gitlab-org/gitlab@master
2020-05-27 06:08:13 +00:00
3a2abc1d50
Enable the Layout/ExtraSpacing cop
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-01-24 13:05:45 +01:00
12ee2753c1
Enable even more frozen string in app/controllers
...
Enables frozen string for some vestigial files as
well as the following:
* app/controllers/projects/**/*.rb
* app/controllers/sherlock/**/*.rb
* app/controllers/snippets/**/*.rb
* app/controllers/users/**/*.rb
Partially addresses #47424 .
2018-09-25 22:43:49 -07:00
2039c8280d
Disable existing offenses for the CodeReuse cops
...
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
2018-09-11 17:32:00 +02:00
3e66795ef1
Changes tab VUE refactoring
2018-06-21 12:22:40 +00:00
07f516d167
Adjust 404's for LegacyDiffNote discussion rendering
2018-04-05 12:13:42 -03:00
65664c2eae
Refactor discussions/notes code
2018-04-03 16:03:00 +00:00
8fa001e760
Resolve "Projects::MergeRequestsController#show is slow (implement skeleton loading)"
2018-03-13 12:01:36 +00:00
059ab73b8e
Render MR Notes with Vue with behind a cookie
2018-02-28 00:10:43 +00:00
8e5bf9d8dc
Use the new check_project_feature_available! method in project controllers
2017-06-21 10:56:45 +01:00
08bbb9fce6
Add option to start a new discussion on an MR
2017-04-05 17:44:14 +01:00
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
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
892dea6771
Project tools visibility level
2016-09-01 11:47:59 -03:00
4a13aa9f34
Store discussion_id on Note for faster discussion lookup.
2016-08-17 12:16:46 -05:00
41007f6d3c
Address review feedback
2016-08-16 11:04:26 -05:00
e257200459
Add specs for NotesController and DiscussionsController
2016-08-12 16:24:09 -05:00
fa4a613517
Add 'Resolved all discussions' system note
2016-07-28 20:39:35 -06:00
1c2eefef3f
Backend tweaks
2016-07-28 20:09:36 -06:00
2247d8a4fd
Updates the text above discussions when resolving notes & discussions
2016-07-27 18:34:04 +01:00
a678fef836
Added resolved by users name into tooltip
2016-07-26 15:47:19 +01:00
eeb41c759e
Add endpoints to resolve diff notes and discussions
2016-07-25 22:45:23 -06:00
GitLab Bot