| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc42 | GitLab Bot | 2021-04-20 | 1 | -14/+1 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40 | GitLab Bot | 2021-03-16 | 1 | -7/+6 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42 | GitLab Bot | 2021-02-18 | 1 | -8/+6 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42 | Robert Speicher | 2021-01-20 | 1 | -0/+30 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42 | GitLab Bot | 2020-10-21 | 1 | -18/+4 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-4-stable-ee | GitLab Bot | 2020-09-19 | 1 | -4/+42 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-2-stable-ee | GitLab Bot | 2020-07-20 | 1 | -1/+20 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-1-stable-ee | GitLab Bot | 2020-06-18 | 1 | -12/+29 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@13-0-stable-ee | GitLab Bot | 2020-05-20 | 1 | -1/+1 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-04-07 | 1 | -17/+0 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-04-01 | 1 | -0/+17 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-03-13 | 1 | -1/+1 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-03-12 | 1 | -1/+1 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-02-21 | 1 | -1/+1 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-02-10 | 1 | -0/+5 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2020-01-10 | 1 | -2/+2 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-12-03 | 1 | -5/+6 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-11-19 | 1 | -8/+0 |
| | | |||||
| * | Add latest changes from gitlab-org/gitlab@master | GitLab Bot | 2019-11-15 | 1 | -19/+87 |
| | | |||||
| * | [CE port] Bypass push rules for merge to ref serviceosw-bypass-push-rules-for-merge-to-ref | Oswaldo Ferreira | 2019-07-09 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | Turns out push rules to validate commit message does not apply in the context of automatic merge to the refs/merge-requests/:iid/merge. Mainly because if it fails to merge to it, we currently can't give enough preemptive feedback to the user and it'll turn the merge request unmergeable (given we automatically mark it as unmergeable if we can't merge to the ref). In general, it's a systematic operation, which already bypasses user authorization and git hooks. Therefore, this commit makes it bypass the push rules at EE as well. | ||||
| * | Replace 'JIRA' with 'Jira' | Takuya Noguchi | 2019-06-28 | 1 | -3/+3 |
| | | | | | | | https://community.atlassian.com/t5/Jira-questions/Is-it-quot-JIRA-quot-or-quot-Jira-quot/qaq-p/681163 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com> | ||||
| * | Add frozen_string_literal to spec/servicesfrozen_string_literal_spec_services | Thong Kuah | 2019-04-12 | 1 | -0/+2 |
| | | | | | Probably useful as we often move these files to "new" files. | ||||
| * | [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requests | Oswaldo Ferreira | 2019-04-08 | 1 | -2/+2 |
| | | | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder). | ||||
| * | Allow custom hooks errors to appear in GitLab UI | Luke Duncalfe | 2019-03-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Revert "Merge branch 'sh-show-pre-receive-error-merge' into 'master'" | Luke Duncalfe | 2019-03-08 | 1 | -1/+1 |
| | | | | This reverts merge request !25708 | ||||
| * | Show pre-receive error message in merge request widget | Stan Hu | 2019-03-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | 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 | ||||
| * | Check authorization in merge services | Oswaldo Ferreira | 2019-02-25 | 1 | -0/+12 |
| | | | | | | Move authorization checks to merge services instead relying solely on external checks. | ||||
| * | Allow custom squash commit messages | Luke Duncalfe | 2019-02-06 | 1 | -1/+1 |
| | | |||||
| * | Retrieve merge request closing issues from database cache | Felipe Artur | 2018-08-06 | 1 | -0/+1 |
| | | |||||
| * | Resolve "Rename the `Master` role to `Maintainer`" Backend | Mark Chao | 2018-07-11 | 1 | -1/+1 |
| | | |||||
| * | Updates from `rubocop -a` | Lin Jen-Shin | 2018-07-09 | 1 | -1/+1 |
| | | |||||
| * | Don't use Gitlab::Utils.nlbr in Gitlab::Git | Jacob Vosmaer (GitLab) | 2018-06-11 | 1 | -1/+1 |
| | | |||||
| * | Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ce | blackst0ne | 2018-05-29 | 1 | -13/+47 |
| | | |||||
| * | Save and expose only generic merge error | Jan Provaznik | 2018-05-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Clear caches before updating MR diffs | Zeger-Jan van de Weg | 2017-12-14 | 1 | -4/+4 |
| | | | | | | | 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. | ||||
| * | Prevent fast forward merge when rebase is requiredissue_39773_be | Felipe Artur | 2017-11-10 | 1 | -0/+22 |
| | | |||||
| * | Make merge_jid handling less stateful in MergeService | Oswaldo Ferreira | 2017-10-27 | 1 | -49/+0 |
| | | |||||
| * | add spec | micael.bergeron | 2017-10-11 | 1 | -7/+16 |
| | | |||||
| * | Clean merge_jid whenever necessary on the merge process38476-improve-merge-jid-cleanup-on-merge-process | Oswaldo Ferreira | 2017-09-27 | 1 | -3/+20 |
| | | | | | 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" | ||||
| * | Cleans merge_jid when possible on MergeService36114-stuck-mrs-job-follow-up | Oswaldo Ferreira | 2017-08-28 | 1 | -5/+28 |
| | | |||||
| * | Track enqueued and ongoing MRs | Oswaldo Ferreira | 2017-08-28 | 1 | -0/+9 |
| | | |||||
| * | Move GitHooksService to Gitlab::Git | Jacob Vosmaer | 2017-08-23 | 1 | -1/+1 |
| | | |||||
| * | Use described_class when possible | Rémy Coutable | 2017-07-27 | 1 | -7/+7 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Remove superfluous lib: true, type: redis, service: true, models: true, ↵ | Rémy Coutable | 2017-07-27 | 1 | -1/+1 |
| | | | | | | | services: true, no_db: true, api: true Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Prevent accidental deletion of protected MR source branch by repeating ↵dm-always-verify-source-branch-can-be-deleted | Douwe Maan | 2017-07-04 | 1 | -11/+58 |
| | | | | | checks before actual deletion | ||||
| * | Enable Style/DotPosition Rubocop :cop: | Grzegorz Bizon | 2017-06-21 | 1 | -3/+3 |
| | | |||||
| * | Correct RSpec/SingleLineHook cop offenses | Robert Speicher | 2017-06-14 | 1 | -1/+3 |
| | | |||||
| * | Show merge errors in merge request widget | Sean McGivern | 2017-02-16 | 1 | -9/+20 |
| | | | | | | | | | | | | | | | | | | 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). | ||||
| * | Refactor JiraService by moving code out of JiraService#execute methodclean-up-jira-service | Adam Niedzielski | 2016-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | 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. | ||||
| * | Rephrase some system notes to be compatible with new system note stylerephrase-system-notes | Douwe Maan | 2016-11-24 | 1 | -1/+1 |
| | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |