| Age | Commit message (Collapse) | Author |
|---|
|
'40530-merge-request-generates-wrong-diff-when-branch-and-tag-have-the-same-name' into 'master'
Resolve "Merge request generates wrong diff when branch and tag have the same name"
Closes #40530
See merge request gitlab-org/gitlab-ce!15591
|
|
If a merge request was created with a branch name that also matched a tag name,
we'd generate a comparison to or from the tag respectively, rather than the
branch. Merging would still use the branch, of course.
To avoid this, ensure that when we get the branch heads, we prepend the
reference prefix for branches, which will ensure that we generate the correct
comparison.
|
|
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40373
When copying some text from another note and paste,
it goes through `copy_as_gfm` `paste` handler
that calls `e.preventDefault()` which stops things.
But then when inserting the text, we manually trigger
an `input` event with jQuery which doesn't seem to be
picked up by Vue `v-model`.
Using copy/paste trick from https://stackoverflow.com/a/41046276/796832
|
|
Previously we'd use "event.author_email" which translates to
"event.author.email". This would result in an extra query being executed
_for every event_ just to get the same author's Email address.
Instead of doing all this useless work we can just pass the User object
returned by "event.author" since:
1. This allows us to re-use the user object's Email address.
2. Authors are eager-loaded, so this doesn't cause any N+1 queries.
|
|
Fix defaults for MR states and merge statuses
Closes #40534
See merge request gitlab-org/gitlab-ce!15594
|
|
Hashed storage attachments migration path
See merge request gitlab-org/gitlab-ce!15352
|
|
Strip leading & trailing whitespaces in CI/CD secret variable keys
See merge request gitlab-org/gitlab-ce!15615
|
|
Add new API endpoint - list jobs of a specified runner
Closes #39699
See merge request gitlab-org/gitlab-ce!15432
|
|
Upgrade seed-fu to 2.3.7
Closes #40568
See merge request gitlab-org/gitlab-ce!15607
|
|
Add new API endpoint - get a namespace by ID
Closes #40254
See merge request gitlab-org/gitlab-ce!15442
|
|
|
|
|
|
Added Changelog
added feature spec
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Create issue and merge request destroy services
Closes #39601
See merge request gitlab-org/gitlab-ce!15604
|
|
|
|
|
|
|
|
Upgrade jQuery to 2.2.4
Closes #40481
See merge request gitlab-org/gitlab-ce!15570
|
|
ignore hashed repositories when doing rake gitlab:cleanup:dirs
Closes #40352
See merge request gitlab-org/gitlab-ce!15600
|
|
|
|
|
|
|
|
Update svg external dependency
See merge request gitlab-org/gitlab-ce!15596
|
|
|
|
Drastically improve project search performance by no longer searching namespace name
Closes #40510 and #39623
See merge request gitlab-org/gitlab-ce!15590
|
|
|
|
namespace name
|
|
This ensures that merge_requests.state and merge_requests.merge_status
both have a proper default value and NOT NULL constraint on database
level. We also make sure to update any bogus rows first, without blowing
up the database.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/40534
|
|
Fix WIP system note not being created
Closes #40374
See merge request gitlab-org/gitlab-ce!15528
|
|
|
|
Fix pulling and pushing using a personal access token with the sudo scope
Closes #40466
See merge request gitlab-org/gitlab-ce!15571
|
|
Update Prometheus Gem version and disable Prometheus method call instrumentation by default.
Closes gitlab-ee#4139 and #40457
See merge request gitlab-org/gitlab-ce!15558
|
|
|
|
|
|
[ci skip]
|
|
|
|
|
|
Use foreign key to get latest MR diff
Closes #37631
See merge request gitlab-org/gitlab-ce!15126
|
|
Fix link text from group context
Closes gitlab-ee#4100
See merge request gitlab-org/gitlab-ce!15565
|
|
|
|
|
|
|
|
Compared to the merge_request_diff association:
1. It's simpler to query. The query uses a foreign key to the
merge_request_diffs table, so no ordering is necessary.
2. It's faster for preloading. The merge_request_diff association has to load
every diff for the MRs in the set, then discard all but the most recent for
each. This association means that Rails can just query for N diffs from N
MRs.
3. It's more complicated to update. This is a bidirectional foreign key, so we
need to update two tables when adding a diff record. This also means we need
to handle this as a special case when importing a GitLab project.
There is some juggling with this association in the merge request model:
* `MergeRequest#latest_merge_request_diff` is _always_ the latest diff.
* `MergeRequest#merge_request_diff` reuses
`MergeRequest#latest_merge_request_diff` unless:
* Arguments are passed. These are typically to force-reload the association.
* It doesn't exist. That means we might be trying to implicitly create a
diff. This only seems to happen in specs.
* The association is already loaded. This is important for the reasons
explained in the comment, which I'll reiterate here: if we a) load a
non-latest diff, then b) get its `merge_request`, then c) get that MR's
`merge_request_diff`, we should get the diff we loaded in c), even though
that's not the latest diff.
Basically, `MergeRequest#merge_request_diff` is the latest diff in most cases,
but not quite all.
|
|
|
|
|
|
'fix/sm/37991-avoid-deactivation-when-pipeline-schedules-execute-a-commit-includes-ci-skip' into 'master'
Avoid deactivation when pipeline schedules execute a branch includes `[ci skip]` comment
Closes #37991
See merge request gitlab-org/gitlab-ce!15405
|
|
[ci skip]
|
|
Add edit button to mobile file view
Closes #28377
See merge request gitlab-org/gitlab-ce!15199
|
|
Temporarily force disable prometheus metrics
See merge request gitlab-org/gitlab-ce!15549
|
