| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | |||||
| * | Allow enabling and disabling commit and MR events for JIRAissue_5541 | Felipe Artur | 2016-11-18 | 1 | -0/+16 |
| | | |||||
| * | Add JIRA remotelinks and prevent duplicated closing messages | Felipe Artur | 2016-11-18 | 1 | -2/+4 |
| | | |||||
| * | Prevent wrong markdown on issue ids when project has Jira service activatedissue_828 | Felipe Artur | 2016-10-19 | 1 | -0/+12 |
| | | |||||
| * | Improve error logging of MergeService | Stan Hu | 2016-10-18 | 1 | -2/+2 |
| | | | | | Relates to #23505 | ||||
| * | Add markdown cache columns to the database, but don't use them yet | Nick Thomas | 2016-10-07 | 1 | -1/+4 |
| | | | | | | | | | | | | | 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. | ||||
| * | Fix bug when trying to cache closed issues from external issue trackersissue_22446 | Felipe Artur | 2016-10-03 | 1 | -0/+36 |
| | | |||||
| * | Close todos when accepting a MR via the API. | Tony Gambone | 2016-09-29 | 1 | -0/+24 |
| | | |||||
| * | adds second batch of tests changed to active tenseactive-tense-test-coverage | tiagonbotelho | 2016-08-09 | 1 | -2/+2 |
| | | |||||
| * | Properly abort a merge when merge conflicts occurreject-merge-conflicts | Stan Hu | 2016-07-29 | 1 | -0/+11 |
| | | | | | | | | | | | | 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 | ||||
| * | Avoid `describe`-ing symbols in specsrs-describe-symbols | Robert Speicher | 2016-07-12 | 1 | -1/+1 |
| | | |||||
| * | Handle custom Git hook result in GitLab UI | Valery Sizov | 2016-07-04 | 1 | -0/+10 |
| | | |||||
| * | Allows MR authors to have the source branch removed when merging the MR | Jeroen Jacobs | 2016-05-20 | 1 | -0/+15 |
| | | |||||
| * | Merge branch 'master' into split-up-builds | Douwe Maan | 2015-12-09 | 1 | -4/+5 |
| |\ | |||||
| | * | Merge branch 'master' into merge-if-green | Zeger-Jan van de Weg | 2015-12-07 | 1 | -1/+3 |
| | |\ | |||||
| | * | | Specs for 'Merge When Build Succeeds' | Zeger-Jan van de Weg | 2015-12-02 | 1 | -4/+4 |
| | | | | |||||
| * | | | Tag service specs | Douwe Maan | 2015-12-09 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | test fix | Valery Sizov | 2015-11-30 | 1 | -2/+3 |
| |/ | |||||
| * | Improve error message when merging failsmr_improve_errors_handling | Valery Sizov | 2015-10-01 | 1 | -0/+14 |
| | | |||||
| * | Revert "Merge branch 'revert-satellites' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 1 | -5/+0 |
| | | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c. | ||||
| * | Revert "Merge branch 'drop-satellites'" | Dmitriy Zaporozhets | 2015-08-11 | 1 | -0/+5 |
| | | | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix merge request creation without branch selected | Dmitriy Zaporozhets | 2015-08-05 | 1 | -5/+0 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Updated rspec to rspec 3.x syntax | Jeroen van Baarsen | 2015-02-12 | 1 | -6/+6 |
| | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | ||||
| * | Add action property to merge request hook | jubianchi | 2015-01-20 | 1 | -0/+44 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |