summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/update_service.rb
Commit message (Collapse)AuthorAgeFilesLines
* Abstract auto merge processesShinya Maeda2019-06-031-1/+1
| | | | | | | | | | | | We have one auto merge strategy today - Merge When Pipeline Succeeds. In order to add more strategies for Merge Train feature, we abstract the architecture to be more extensible. Removed arguments Fix spec
* Fix remove_source_branch merge request API handlingsh-fix-merge-requests-api-remove-branch-paramStan Hu2019-04-151-1/+1
| | | | | | | | | Users attempting to set merge requests to `remove_source_branch` to `false` would encounter an Error 500 because the UpdateService and API checked `present?`, which would always return `false`. We now just use `has_key?` to decide whether the parameter is present. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60530
* [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-081-12/+6
| | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* Enable fast task lists for merge requestsBrett Walker2019-02-071-1/+6
| | | | Allow single tasks to be updated quickly
* Merge branch 'blackst0ne-bump-rails-cve-2018-16476' into 'master'Grzegorz Bizon2019-01-021-2/+4
|\ | | | | | | | | Bump Ruby on Rails to 5.0.7.1 See merge request gitlab-org/gitlab-ce!23396
| * Bump Ruby on Rails to 5.0.7.1blackst0ne-bump-rails-cve-2018-16476blackst0ne2018-12-211-2/+4
| | | | | | | | Fix the CVE-2018-16476 vulnerability.
* | Change deprecated `except!` usagesRobert Speicher2018-12-161-4/+5
|/ | | | | These can just be `delete` calls, with the caveat that it only takes one argument.
* Add email for milestone changeChantal Rollison2018-11-021-0/+14
|
* Enable more frozen string in app/services/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-apps-services-inner-moregfyoung2018-07-171-0/+2
| | | | Partially addresses #47424.
* Move NotificationService calls to SidekiqSean McGivern2018-04-251-3/+8
| | | | | | | | | | | | | | | | | | | | | The NotificationService has to do quite a lot of work to calculate the recipients for an email. Where possible, we should try to avoid doing this in an HTTP request, because the mail are sent by Sidekiq anyway, so there's no need to schedule those emails immediately. This commit creates a generic Sidekiq worker that uses Global ID to serialise and deserialise its arguments, then forwards them to the NotificationService. The NotificationService gains an `#async` method, so you can replace: notification_service.new_issue(issue, current_user) With: notification_service.async.new_issue(issue, current_user) And have everything else work as normal, except that calculating the recipients will be done by Sidekiq, which will then schedule further Sidekiq jobs to send each email.
* /wip slash command on MR creationAdam Pahlevi2018-03-011-11/+0
| | | | | | | | | | | | change to symbol add complete changelog add test for /wip unwip as sym test for work in progress separate from issuable
* Refactor the way we pass `old associations` to issuable's update services40226-refactor-the-issuable-s-webhooks-data-architectureRémy Coutable2017-11-241-2/+3
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-021-4/+6
|
* Rename MergeRequest#async_merge to merge_asyncOswaldo Ferreira2017-08-281-1/+1
|
* Track enqueued and ongoing MRsOswaldo Ferreira2017-08-281-1/+1
|
* Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-151-3/+3
| | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070 Deprecate "chat commands" in favor of "slash commands" We looked for things like: - `slash commmand` - `slash_command` - `slash-command` - `SlashCommand`
* Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-041-1/+4
|
* Create todos only for new mentionsJarka Kadlecova2017-03-291-1/+1
|
* support `/merge` slash comand for MRsJarka Kadlecova2017-01-111-0/+15
|
* Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-161-1/+1
|
* Remove unnecessary require_relative calls from service classesSemyon Pupkov2016-11-221-4/+0
| | | | | Rails by default use autoload for all dirs from app folder. require_relative not needed. See ActiveSupport::Dependencies.autoload_paths
* Maintain "force_remove_source_branch" options on Merge Request unless specifiedMark Fletcher2016-10-131-1/+4
|
* Add a /wip slash commandThomas Balthazar2016-10-031-1/+14
| | | | It toggles the 'WIP' prefix in the MR title.
* Use the `IssuableBaseService` lifecycle hooks to cache ↵Timothy Andrew2016-09-211-0/+4
| | | | | | | `MergeRequestsClosingIssues` - Instead of overriding `create` and `update` in `MergeRequests::BaseService` - Get all merge request service specs passing
* User can edit closed MR with deleted forkKatarzyna Kobierska2016-08-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | Add test for closed MR without fork Add view test visibility of Reopen and Close buttons Fix controller tests and validation method Fix missing space Remove unused variables from test closed_without_fork? method refactoring Add information about missing fork When closed MR without fork can't edit target branch Tests for closed MR edit view Fix indentation and rebase, refactoring
* Add notifications for new user mentions in merge requestsNick Thomas2016-08-151-1/+8
|
* Fix a 'missing keyword' error introduced in the last commitNick Thomas2016-08-151-1/+3
|
* Allows MR authors to have the source branch removed when merging the MRJeroen Jacobs2016-05-201-0/+2
|
* Improving the original label-subscribing implementationRémy Coutable2016-03-151-5/+9
| | | | | | | 1. Make the "subscribed" text in Issuable sidebar reflect the labels subscription status 2. Current user mut be logged-in to toggle issue/MR/label subscription
* Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-151-1/+6
| | | | | | | | | | | | | | | | | | 1. Allow subscribing (the current user) to a label - Refactor the `Subscription` coffeescript class - The main change is that it accepts a container, and conducts all DOM queries within its scope. We need this because the labels page has multiple instances of `Subscription` on the same page. 2. Creating an issue or MR with labels notifies users subscribed to those labels - Label `has_many` subscribers through subscriptions. 3. Adding a label to an issue or MR notifies users subscribed to those labels - This only applies to subscribers of the label that has just been added, not all labels for the issue.
* Rename Tasks to TodosDouglas Barbosa Alexandre2016-02-201-3/+3
|
* Rename IssuableBaseService#have_changes? to has_changes?Douglas Barbosa Alexandre2016-02-201-1/+1
|
* Ensure that we only have one task per issue/mrDouglas Barbosa Alexandre2016-02-201-0/+5
|
* Create a pending task when a user is mentioned when edit a issue/mr/noteDouglas Barbosa Alexandre2016-02-201-1/+1
|
* Rename TaskService#mark_as_done to mark_pending_tasks_as_doneDouglas Barbosa Alexandre2016-02-201-1/+1
|
* Move common behavior to to IssuableBaseServiceDouglas Barbosa Alexandre2016-02-201-17/+0
|
* Marks pending tasks for an user as done when he edit a MRDouglas Barbosa Alexandre2016-02-201-0/+21
|
* Create a pending task when an MR is assigned to someoneDouglas Barbosa Alexandre2016-02-201-0/+1
|
* Marks pending tasks for an user as done when he edit an issueDouglas Barbosa Alexandre2016-02-201-1/+1
|
* Generate system note after Task item has been updated on Issue or Merge ↵Ruben Davila2015-11-191-4/+0
| | | | | | | | | | | | Request. #2296 Everytime the User check or uncheck a Task Item from the Issue or Merge Request description, a new update is going to be added to the activity logs of the Issue or Merge Request. Note that when using the edit form, you can only update the Task item status or add/delete/modify existing ones. Doing both actions is not fully supported.
* Refactor similar code for Issue and MR update serviceDmitriy Zaporozhets2015-11-171-30/+9
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Split huge method MergeRequests::UpdateService#executeDmitriy Zaporozhets2015-11-131-22/+25
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use issue editor as cross reference comment author when issue is edited with ↵edit-new-cross-referencesDouwe Maan2015-10-281-1/+1
| | | | a new mention.
* Simplify code around (cross)-referencesDouwe Maan2015-10-121-1/+1
|
* Show who last edited a comment if it wasn't the original authorDouwe Maan2015-07-301-1/+1
|
* Rename `notice_added_references` to `create_new_cross_references!`rs-issue-1773Robert Speicher2015-07-131-1/+1
|
* Simplify Issue and MergeRequest UpdateServicesrs-remove-task-statesRobert Speicher2015-07-081-6/+2
| | | | Now that those pesky task states are gone, these become a lot simpler.
* Remove unused `task_[un]check` states from Update servicesRobert Speicher2015-07-081-5/+1
| | | | These were left over from the old Task handling.
* Dont allow set assignee, milestone or labels if user is guestDmitriy Zaporozhets2015-06-251-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Disable changing of the source branch in merge request update APIStan Hu2015-05-291-1/+2
|