| Age | Commit message (Collapse) | Author |
|---|
|
|
|
Find and mark more Git disk access locations, part 2
See merge request gitlab-org/gitlab-ce!19437
|
|
|
|
|
|
from Tag)"
|
|
Rephrase Merge Request Maintainer Edit
See merge request gitlab-org/gitlab-ce!19061
|
|
|
|
branch"
"Maintainer" will be freed to be used for #42751
|
|
|
|
Old behavior of creating TODO when
“Merge When Pipeline Succeeds” service fails, is generalized to:
Create a TODO whenever MR became unmergeable
(and similar to notification, MR author and merge_user are both applicable)
|
|
First, transitions between can_be_merged & cannot_be_merged are removed,
as they are currently blocked in `check_if_can_be_merged`.
`can_be_merge` always returns to `unchecked` first,
before it can transition to `cannot_be_merged` (and vice versa).
We want to avoid repeated notification triggered by repeated transition
between `cannot_be_merged` & `unchecked`.
So we added `cannot_be_merged_recheck` state, similar to `unchecked`,
but as a mean to remember it’s from cannot_be_merged.
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18042/#note_65945407
Since `unchecked` and `cannot_be_merged_recheck` both mean
“we are in the middle of checking if it is mergeable”,
quite often we need to see if merge_status is in either one of them,
so `check_state?` is added to achieve this.
|
|
When an error occurs during merge, the error message is exposed to user
and it is also saved in DB. This error message may be user unfriendly
(as in !41820) and it could also expose a detailed backend information.
Instead of displaying the specific error message, only sanitized generic
message is displayed. This is potentially controversial change because
disadvantage is that user doesn't get specific reason of failure.
Additional changes:
* repository.merge including exceptions is is extracted into a
separate method to make things clearer
* update! is used instead of update so we don't silently ignore
an error
Related to !41857
|
|
This prevents creating merge requests targeting archived projects.
This could happen when a project was already forked, but then the
source was archived.
|
|
If the ref hasn't been fetched into the target repository yet, this will fail
with a Rugged::ReferencError (assuming we're not using Gitaly). We should handle
this in the same way as a missing ref.
|
|
Closes #23460
|
|
This may lead to some being evicted and having to be cached again, but many MRs
get closed or updated in that time anyway.
|
|
Previously, we kept them all in the cache. We don't need the highlight results
for older diffs - if someone does view that (which is rare), we can do the
highlighting on the fly.
|
|
When a project is not private, and the source branch not protected the
user can now select the option to allow maintainers to push to this
branch
|
|
New `/wip` quick action on MR creation
Closes #26848
See merge request gitlab-org/gitlab-ce!17463
|
|
Closes gitaly#1046
|
|
change to symbol
add complete changelog
add test for /wip
unwip as sym
test for work in progress separate from issuable
|
|
|
|
Before, this would:
1. Not use the correct reference for non-JIRA external trackers.
2. Append 'Closes ' if an external tracker was enabled, but no issue matched the
branch name.
|
|
When JIRA or Redmine were enabled and the branch name did not match the
matching regular expression, the `issue_iid` would be `nil`, preventing
users from creating merge requests.
Closes #43193
|
|
Refactor Gitlab::Git code related to LFS changes for Gitaly migration
Closes gitaly#980
See merge request gitlab-org/gitlab-ce!16835
|
|
We stop relying on Gitlab::Git::Env for the RevList class, and use
Gitlab::Git::Repository#run_git methods inteaad. The refactor also fixes
another issue, since we now top using "path_to_repo" (which is a
Repository model method).
|
|
Resolve "Incorrect merge request title when Jira activated and multiple commits on branch"
Closes #40793
See merge request gitlab-org/gitlab-ce!16491
|
|
commits on branch"
|
|
Reload source MRs memoization after diffs creation
Closes #42668
See merge request gitlab-org/gitlab-ce!16868
|
|
|
|
|
|
Make user/author use project.creator in most factories
Closes #36009
See merge request gitlab-org/gitlab-ce!13321
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
|
Backport 10.3.4 security fixes into master
See merge request gitlab-org/gitlab-ce!16509
|
|
Set target_branch to the ref branch when creating MR from issue
Closes #41727
See merge request gitlab-org/gitlab-ce!16422
|
|
|
|
check project access on MR create
See merge request gitlab/gitlabhq!2273
(cherry picked from commit 1fe2325d6ef2bced4c5e97b57691c894f38b2834)
43e85f49 check project access on MR create
|
|
Migrate Gitlab::Git::Repository#rebase to Gitaly
Closes gitaly#863
See merge request gitlab-org/gitlab-ce!16259
|
|
into 'master'
Resolve "Incorrect default merge request title when Jira activated"
Closes #36669
See merge request gitlab-org/gitlab-ce!16356
|
|
|
|
Closes gitaly#863
|
|
Instead of storing detailed rebase error, only a generic message is
stored with MR. The reason is that this message is exposed and displayed
to end user and there is no reason to expose detailed backend
information. Error message is still logged so detailed information
can be found in logfile by admin if needed.
Related #41820
|
|
activated
|
|
When a project uses fast-forward merging strategy user has
to rebase MRs to target branch before it can be merged.
Now user can do rebase in UI by clicking 'Rebase' button
instead of doing rebase locally.
This feature was already present in EE, this is only backport
of the feature to CE. Couple of changes:
* removed rebase license check
* renamed migration (changed timestamp)
Closes #40301
|
|
Improve closed/merged events queries performance on Projects::MergeRequestsController#show.json
See merge request gitlab-org/gitlab-ce!15642
|
|
|
|
|
|
|
