- Mark MRs as merged by other MR if other MR contains the diff_head_sha
- Mark MRs as manually merged when there is no other MR that contains the
  diff_head_sha

Changelog: changed

extend the merge_request_finder by functions to filter by merge_user
and add frontend and API code to display the additional filters

Changelog: added

Signed-off-by: Martin Schurz <Martin.Schurz@telekom.de>

Zhiyuan Lu authored 1 year ago and Tiger Watson committed 1 year ago

Changelog: added
MR: !134555
EE: false

Gary Holtz authored 1 year ago and Andy Schoenen committed 1 year ago

Changelog: performance

Addressing Issue #415196

Changelog: other

Gary Holtz authored 1 year ago and Krasimir Angelov committed 1 year ago

Changelog: other

Niklas van Schrick authored 1 year ago and Pavel Shutsin committed 1 year ago

Changelog: added

When adding a `Approved By` or `Approver` filter and sorting by
milestone, a 500 error will occur because of a SQL error:

```
PG::GroupingError: ERROR:  column "milestones.due_date" must appear in
the GROUP BY clause or be used in an aggregate function
```

This happens because the approval query uses a `GROUP BY` query to
find merge requests that match all approvers. However, this `GROUP BY`
query breaks the SQL query since it's expected that
`milestones.due_date` and `milestones.id` are present in that clause.

We can solve this problem in a few ways:

1. Add the required grouping columns to this query (this commit).
2. Use a CTE to isolate the query for approvers.
3. Rewrite the approvers query to avoid the GROUP BY altogether.

The second way appears to work, but there's a risk of running into
errors due to nested queries. Plus, it does not appear the CTE
improves performance.

The third way may also be possible, but it would possibly require some
schema changes or other refactoring.

For now, we can solve this problem by manually adding the required
grouping columns when approvers are specified.

Relates to #223062

Changelog: fixed

Sincheol (David) Kim authored 2 years ago and Heinrich Lee Yu committed 2 years ago

It also removes remaining attention request support code.

Changelog: removed

Adds a new filter option `Attention requested` that takes a username
and then filters merge requests that have that user as an assignee
or reviewer with their attention requested.

Changelog: added

Closes #324854

Changelog: added
Signed-off-by: Rémy Coutable <remy@rymai.me>

This feature flag was already enabled since 13.4 and can be
removed now.

Changelog: other

Toon Claes authored 4 years ago and Peter Leitzen committed 4 years ago

Ruby does some weird things when dynamically loading classes. It seems
in some cases it did not load `MergeRequestsFinder::Params` when it's
calling `#params_class`. In that case the superclass method is called
instead.

We discovered this issue in `IssuesFinder` before, and it was addressed
in !41835.
This change applies the same change to `MergeRequestsFinder`.

Closes #296939

Contributes to #21686

* Add database indices for `squash_commit_sha` field
* Add new scope `by_related_commit_sha` to MergeRequest model
* Update MergeRequestFinder logic to use `by_related_commit_sha` scope
for filtering

This reverts merge request !47074

This reverts merge request !45738

Sincheol (David) Kim authored 4 years ago and James Fargher committed 4 years ago

This reverts merge request !45602

Yorick Peterse authored 4 years ago and Mark Chao committed 4 years ago

This feature is deemed stable and ready to be released.

See #267561 for more
information.

Phil Hughes authored 4 years ago and Igor Drozdov committed 4 years ago

This fixes the target branch filter in merge requests to allow
the user to filter by not equal.

This reverts commit 550f2982.

This adds support for filtering merge requests by the environment name
and deployment times, in addition to the existing support of filtering
merge requests by a deployment ID. This means you can now get merge
requests that match an environment name, deployment ID, or are deployed
before/after a given date and time. These filters can be combined as
well.

Filtering merge requests by deployments data makes it easy to see what
has been deployed, and when. In addition, you can apply all the other
merge requests filters such as a list of labels to filter by.

This new feature is hidden behind the "deployment_filters" feature flag,
which is disabled by default. This feature flag is a global flag. Merge
requests can be retrieved for both projects and groups, making it
difficult to determine what to scope the feature flag to. So we take the
easy way: it's either enabled for all, or disabled for all. For
something as simple as a few additional filters this should not pose any
problems.

See gitlab-com/gl-infra/delivery#1246 for
more information.

Sincheol (David) Kim authored 4 years ago and charlie ablett committed 4 years ago

- It loads review requested MRs as part of Assignee filter
- We would probably want a dedicated filter for it down the track, but
this is our first iteration

Move "Approved-By" filter for MRs to CE (FOSS);
Move "/approve" Quick Action to CE (FOSS).

- Move the filter from ProductivityAnalytics
- Expose `merged_after` and `merged_before` arguments in GraphQL

We can mark WIP merge requests as Draft and should be able to
filter by them

Etienne Baqué authored 5 years ago and Mayra Cabrera committed 5 years ago

Refactored merge request API params into module.
Leveraged MergeRequestHelpers in Deployment API.
Updated Deployment API documentation.

Added new scopes related to issues and releases.
Updated IssuableFinder with use of new scopes.

All instances of injecting an EE specific module have been changed to
use the new methods for this: prepend_if_ee, extend_if_ee, and
include_if_ee. This allows these lines to be included in CE, even when
the modules to inject do not exist. This in turn allows us to backport
these lines to CE and keep them there, instead of having to strip them
out.

Paul Slaughter authored 5 years ago and Phil Hughes committed 5 years ago

**Why?**
Currently the IDE loads a merge request based on only the
`source_branch` name. This means it loads MR's from
forks that have the same branch name (not good).

- This required updating the BE API to accept `source_project_id`

Conflicts:
  config/routes.rb

Igor Drozdov authored 5 years ago and Mike Greiling committed 5 years ago

This reverts commit 6d5c21e8.