Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-03Merge branch 'jej/mattermost-notification-confidentiality' into 'security-10-4'Douwe Maan
Prevent notes on confidential issues from being sent to chat See merge request gitlab/gitlabhq!2248
2017-12-22Replace '.team << [user, role]' with 'add_role(user)' in specsblackst0ne
2017-12-13Make discussion mail References all notes in the discussionToon Claes
When a note is part of a discussion, the email sent out will be `In-Reply-To` the previous note in that discussion. It also `References` all the previous notes in that discussion, and the original issue. Closes gitlab-org/gitlab-ce#36054.
2017-12-13Make mail notifications of discussion notes In-Reply-To of each otherToon Claes
When a note is part of a discussion, the email sent out should be `In-Reply-To` the previous note in that discussion. Closes gitlab-org/gitlab-ce#36054
2017-12-06Throttle the number of UPDATEs triggered by touchYorick Peterse
This throttles the number of UPDATE queries that can be triggered by calling "touch" on a Note, Issue, or MergeRequest. For Note objects we also take care of updating the associated "noteable" relation in a smarter way than Rails does by default.
2017-11-20add the missing specmicael.bergeron
2017-10-07Commenting on image diffsFelipe Artur
2017-08-03Change all `:empty_project` to `:project`Robert Speicher
2017-07-27Use described_class when possibleRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27Remove superfluous lib: true, type: redis, service: true, models: true, ↵Rémy Coutable
services: true, no_db: true, api: true Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-21Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon
2017-06-14Correct RSpec/SingleLineHook cop offensesRobert Speicher
2017-05-03Allow commenting on older versions of the diff and comparisons between diff ↵Douwe Maan
versions
2017-04-11Fix issue's note cache expiration after deletemhasbini
2017-04-05Address review commentsDouwe Maan
2017-04-05Fix specsDouwe Maan
2017-04-05Don't use original_discussion_idDouwe Maan
2017-04-05Add specsDouwe Maan
2017-04-05Fix some specsDouwe Maan
2017-04-05Add option to start a new discussion on an MRDouwe Maan
2017-03-01Invalidate ETag cache when note changesAdam Niedzielski
2017-01-27Use `:empty_project` where possible in model specsRobert Speicher
2017-01-26Merge branch 'rs-empty_project-for-associations' into 'master' Rémy Coutable
Factories with a project association use `:empty_project` by default See merge request !8770
2017-01-25Use a project factory with a repository where necessaryRobert Speicher
2017-01-25address commentsJarka Kadlecova
2017-01-19make mentions working when project not specifiedJarka Kadlecova
2017-01-19Support notes without projectJarka Kadlecova
2016-12-15Merge branch 'jej-note-search-uses-finder' into 'security' Douwe Maan
Fix missing Note access checks in by moving Note#search to updated NoteFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 ## Which fixes are in this MR? :warning: - Potentially untested :bomb: - No test coverage :traffic_light: - Test coverage of some sort exists (a test failed when error raised) :vertical_traffic_light: - Test coverage of return value (a test failed when nil used) :white_check_mark: - Permissions check tested ### Note lookup without access check - [x] :white_check_mark: app/finders/notes_finder.rb:13 :download_code check - [x] :white_check_mark: app/finders/notes_finder.rb:19 `SnippetsFinder` - [x] :white_check_mark: app/models/note.rb:121 [`Issue#visible_to_user`] - [x] :white_check_mark: lib/gitlab/project_search_results.rb:113 - This is the only use of `app/models/note.rb:121` above, but importantly has no access checks at all. This means it leaks MR comments and snippets when those features are `team-only` in addition to the issue comments which would be fixed by `app/models/note.rb:121`. - It is only called from SearchController where `can?(current_user, :download_code, @project)` is checked, so commit comments are not leaked. ### Previous discussions - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b915c5267a63628b0bafd23d37792ae73ceae272_13_13 `: download_code` check on commit - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b915c5267a63628b0bafd23d37792ae73ceae272_19_19 `SnippetsFinder` should be used - `SnippetsFinder` should check if the snippets feature is enabled -> https://gitlab.com/gitlab-org/gitlab-ce/issues/25223 ### Acceptance criteria met? - [x] Tests added for new code - [x] TODO comments removed - [x] Squashed and removed skipped tests - [x] Changelog entry - [ ] State Gitlab versions affected and issue severity in description - [ ] Create technical debt issue for NotesFinder. - Either split into `NotesFinder::ForTarget` and `NotesFinder::Search` or consider object per notable type such as `NotesFinder::OnIssue`. For the first option could create `NotesFinder::Base` which is either inherited from or which can be included in the other two. - Avoid case statement anti-pattern in this finder with use of `NotesFinder::OnCommit` etc. Consider something on the finder for this? `Model.finder(user, project)` - Move `inc_author` to the controller, and implement `related_notes` to replace `non_diff_notes`/`mr_and_commit_notes` See merge request !2035
2016-11-24Rephrase some system notes to be compatible with new system note styleDouwe Maan
2016-08-30remove Ability.abilitieshttp://jneen.net/
2016-08-30remove six, and use a Set insteadhttp://jneen.net/
2016-08-25Capitalize mentioned issue timeline notesClement Ho
2016-08-17Store discussion_id on Note for faster discussion lookup.Douwe Maan
2016-08-13Merge branch 'master' into diff-line-comment-vuejsDouwe Maan
2016-08-12Add specs for new Note and DiffNote methods.Douwe Maan
2016-08-09adds second batch of tests changed to active tensetiagonbotelho
2016-07-21Retrieve rendered HTML from cache in one requestAhmad Sherif
See #19985
2016-07-12Optimize system note visibility checking by hiding notes thatStan Hu
have been fully redacted and contain cross-project references. The previous implementation relied on Note#cross_reference_not_visible_for?, which essentially tries to render all the Markdown references in a system note and only displays the note if the user can see the referring project. But this duplicated the work that Banzai::NotesRenderer was doing already. Instead, for each note we render, we memoize the number of visible user references and use it later if it is available. Improves #19273
2016-07-04Don't garbage collect commits that have related DB records like commentsDouwe Maan
2016-06-14Project members with guest role can't access confidential issuesDouglas Barbosa Alexandre
2016-06-06Backend awardables on commentsZJ van de Weg
2016-06-03Merge branch 'master' into awardablesZ.J. van de Weg
2016-06-01Fix note validation spec failuresStan Hu
2016-06-01Merge branch 'separate-banzai-references' into 'master' Douwe Maan
Separate reference gathering from rendering This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query. cc @rspeicher @DouweM See merge request !3969
2016-06-01Refactor ParticipableYorick Peterse
There are several changes to this module: 1. The use of an explicit stack in Participable#participants 2. Proc behaviour has been changed 3. Batch permissions checking == Explicit Stack Participable#participants no longer uses recursion to process "self" and all child objects, instead it uses an Array and processes objects in breadth-first order. This allows us to for example create a single Gitlab::ReferenceExtractor instance and pass this to any Procs. Re-using a ReferenceExtractor removes the need for running potentially many SQL queries every time a Proc is called on a new object. == Proc Behaviour Changed Previously a Proc in Participable was expected to return an Array of User instances. This has been changed and instead it's now expected that a Proc modifies the Gitlab::ReferenceExtractor passed to it. The return value of the Proc is ignored. == Permissions Checking The method Participable#participants uses Ability.users_that_can_read_project to check if the returned users have access to the project of "self" _without_ running multiple SQL queries for every user.
2016-05-31Merge branch 'data_leak' into 'master' Robert Speicher
Confidential notes data leak Fixes part of https://gitlab.com/gitlab-org/gitlab-ee/issues/575 See merge request !1967
2016-05-31Confidential notes data leakValery Sizov
2016-05-30Merge branch 'master' into awardablesZJ van de Weg
2016-05-30Shut up, RuboCopRobert Speicher
:heart:
2016-05-29Minor changes in note validation specsGrzegorz Bizon