| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
This resolves a conflict and inconsistency with the EE version of
app/models/note.rb.
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This commit adds the module `FromUnion`, which provides the class method
`from_union`. This simplifies the process of selecting data from the
result of a UNION, and reduces the likelihood of making mistakes. As a
result, instead of this:
union = Gitlab::SQL::Union.new([foo, bar])
Foo.from("(#{union.to_sql}) #{Foo.table_name}")
We can now write this instead:
Foo.from_union([foo, bar])
This commit also includes some changes to make this new setup work
properly. For example, a bug in Rails 4
(https://github.com/rails/rails/issues/24193) would break the use of
`from("sub-query-here").includes(:relation)` in certain cases. There was
also a CI query which appeared to repeat a lot of conditions from an
outer query on an inner query, which isn't necessary.
Finally, we include a RuboCop cop to ensure developers use this new
module, instead of using Gitlab::SQL::Union directly.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/51307
|
| |
|
|
|
| |
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
|
| | |
|
| |\
| |
| |
| |
| | |
Group todos
See merge request gitlab-org/gitlab-ce!20675
|
| | |
| |
| |
| | |
This reverts commit 8717c7dad9b5a8fa21ec9a652c54718a6b4c2175.
|
| |\ \
| |/
|/|
| |
| | |
Enable frozen string in app/models/*.rb
See merge request gitlab-org/gitlab-ce!20851
|
| | |
| |
| |
| | |
Partially addresses #47424.
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The status is shown for
- The author of a commit when viewing a commit
- Notes on a commit (regular/diff)
- The user that triggered a pipeline when viewing a pipeline
- The author of a merge request when viewing a merge request
- The author of notes on a merge request (regular/diff)
- The author of an issue when viewing an issue
- The author of notes on an issue
- The author of a snippet when viewing a snippet
- The author of notes on a snippet
- A user's profile page
- The list of members of a group/user
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
'master'
Include full image URL in webhooks for uploaded images
Closes #20720
See merge request gitlab-org/gitlab-ce!18109
|
| | |\ |
|
| | | | |
|
| | | | |
|
| | |/
|/|
| |
| |
| | |
This reverts commit 4d9a3f42f1fd3be21555e19872b7121cca65015e, reversing
changes made to ecf9c145f6e4d170cd059df88743393d9e63c489.
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| | |
* Group filtering now includes also issues/MRs from
subgroups/subprojects
* fixed due_date
* Also DRYed todo controller specs
|
| |/ |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is tricky: the query was being run in
`ObjectStorage::Extension::RecordsUploads#retrieve_from_store!`, but we can't
just add batch loading there, because the `#upload=` method there would use the
result immediately, making the batch only have one item.
Instead, we can pre-emptively add an item to the batch whenever an avatarable
object is initialized, and then reuse that batch item in
`#retrieve_from_store!`. However, this also has problems:
1. There is a lot of logic in `Avatarable#retrieve_upload_from_batch`.
2. Some of that logic constructs a 'fake' model for the batch key. This should
be fine, because of ActiveRecord's override of `#==`, but it relies on that
staying the same.
|
| |
|
|
|
| |
We request Gitaly in a N+1 manner to build discussion diffs. Once the diffs are from different revisions, it's hard to make a single request to the service in order to build the whole response.
With this change we solve this problem and simplify a lot fetching this piece of info.
|
| | |
|
| |\
| |
| |
| |
| | |
Better group support in notes-related code
See merge request gitlab-org/gitlab-ce!18150
|
| | |
| |
| |
| |
| |
| |
| | |
Updates notes-related services and rendering so this code can be
easily used for group-scoped resources (specifically Epics).
Related to gitlab-ee!5205
|
| |/
|
|
|
|
|
|
|
|
| |
'security-10-6'
[10.6] Prevent notes on confidential issues from being sent to chat
See merge request gitlab/gitlabhq!2366
# Conflicts:
# app/helpers/services_helper.rb
|
| | |
|
| |
|
|
|
| |
* adds basic discussions API for issues and snippets
* reorganizes notes specs (so same tests can be used for all noteable types - issues, MRs, snippets)
|
| | |
|
| |
|
|
| |
Fixes #32282.
|
| |
|
|
| |
including/extending it
|
| | |
|
| |
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
| |
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
|
| |
|
|
|
| |
This allows EE to re-use the object, making it easier to trigger
indexing of the noteable.
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
| |
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.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
| |
Security fixes for 10.1 RC
See merge request gitlab/gitlabhq!2209
|
| | |
|
| |
|
|
| |
also fix some code styling issues
|
| |
|
|
|
| |
- only show in merge-requests
- show as a little glyph
|
| | |
|
| |
|
|
|
|
|
| |
this will remove the need make N queries (per-note) at the
cost of having to mark notes with an attribute
this opens up the possibility for other special roles for notes
|
| | |
|
| | |
|
