| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Probably useful as we often move these files to "new" files.
|
| |
|
|
|
| |
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Error messages from custom pre-receive hooks now appear in the GitLab
UI.
This is re-enabling a feature that had been disabled in merge request
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18646
The feature had been disabled due to security concerns that information
which was not intended to be public (like stack traces) would leak into
public view.
PreReceiveErrors (from pre-receive, post-receive and update custom
hooks) are now filtered for messages that have been prefixed in a
particular way.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48132
|
| |
|
| |
This reverts merge request !25708
|
| |
|
|
|
|
|
|
|
|
|
|
| |
When a merge fails due to a locked file, no feedback was given to the
user as to why it failed if the user used the Merge button. However, if
the push attempt happened directly in the Web UI, the pre-receive
message would be displayed.
To be consistent and to make it clear why a merge failed, we now include
the pre-receive error message in the merge request widget.
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10165
|
| |
|
|
|
| |
Move authorization checks to merge services
instead relying solely on external checks.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
| |
The hook ordering influenced the diffs being generated as these used
values from before the update due to the memoization still being in
place. This commit reorders them and tests against this behaviour.
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
MergeRequest#merge_jid should be cleaned up whenever we hit a known error on MergeService#execute. This way we can keep track if the MR is really "ongoing" or "stuck"
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |
|
|
|
|
| |
services: true, no_db: true, api: true
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| |
|
|
| |
checks before actual deletion
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There were two problems here:
1. On the JS side, the reference to $widgetBody didn't refer to the
right DOM element any more. This might be because it was replaced by
the `getMergeStatus` method. Even if it wasn't, ensuring we have the
right element means that the content gets updated.
2. On the Ruby side, the `log_merge_error` method didn't update the
`merge_error` column of the merge request. Change that to update if
requested, and update in the most common cases by default.
Additionally, this would sometimes return an error hash, but it
doesn't look like this was ever used (the return value of
`MergeService#execute` appears to be unused everywhere).
|
| |
|
|
|
|
|
|
|
|
| |
The implicit interface of project services states that the "execute"
method is meant to be called when project hooks are executed.
Currently JiraService does not support any project events even though
JiraService#supported_events says that "commit" and "merge_request"
are supported. They are only used to render correct options in
JIRA configuration screen, but they are not supported.
Because of that, this commit makes "execute" method a no-op.
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Relates to #23505
|
| |
|
|
|
|
|
|
|
|
|
|
| |
This commit adds a number of _html columns and, with the exception of Note,
starts updating them whenever the content of their partner fields changes.
Note has a collision with the note_html attr_accessor; that will be fixed later
A background worker for clearing these cache columns is also introduced - use
`rake cache:clear` to set it off. You can clear the database or Redis caches
separately by running `rake cache:clear:db` or `rake cache:clear:redis`,
respectively.
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
| |
If somehow a user attempted to accept a merge request that had
conflicts (e.g. the "Accept Merge Request" button or the MR itself was
not updated), `MergeService` did not properly detect that a conflict
occurred. It would assume that the MR went through without any issues
and close the MR as though everything was fine. This could cause
data loss if the source branch were removed.
Closes #20425
|
| | |
|
| | |
|
| | |
|
| |\ |
|
| | |\ |
|
| | | | |
|
| | |/
|/| |
|
| |/ |
|
| | |
|
| |
|
|
|
| |
This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing
changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
|
| |
|
|
|
|
|
| |
This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing
changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
