summaryrefslogtreecommitdiff
path: root/app/services/merge_requests
Commit message (Collapse)AuthorAgeFilesLines
* Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-281-1/+1
|
* Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-213-11/+11
|
* 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`
* Merge branch ↵Rémy Coutable2017-06-021-5/+7
|\ | | | | | | | | | | | | | | | | '32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file' into 'master' Resolve "Merge conflict resolution removed the newline in the end of file" Closes #32983 See merge request !11817
| * Keep trailing newline when picking conflict sections32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-fileSean McGivern2017-06-011-5/+7
| | | | | | | | | | If our side of the conflict file has a trailing newline, and we are picking sections, not editing the whole content, then add a trailing newline back.
* | Fix race condition between pipeline creation and MR diff_head_sha updateDouwe Maan2017-06-011-6/+3
|/
* Merge branch 'issue_32225_2' into 'master'Kamil Trzciński2017-05-301-0/+18
|\ | | | | | | | | Set head pipeline when creating merge requests See merge request !11669
| * Set head pipeline when creating merge requestsissue_32225_2Felipe Artur2017-05-291-0/+18
| |
* | Fix counters cache invalidation for Issues and Merge RequestsValery Sizov2017-05-263-0/+3
| |
* | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-232-3/+3
|/
* Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missingDouwe Maan2017-05-181-0/+1
|
* Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-124-65/+99
| | | | | | | | | | | | | | | | | I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way.
* Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-043-3/+11
|
* Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-041-0/+54
|
* Fix 404 when upstream has disabled merge requestsmhasbini2017-04-271-1/+1
|
* Merge branch '30291-reopen-mr' into 'master'Sean McGivern2017-04-061-1/+1
|\ | | | | | | | | | | | | Search for opened MRs - include reopened MRs Closes #30291 See merge request !10407
| * Search for opened MRs - include reopened MRs30291-reopen-mrJarka Kadlecova2017-04-061-1/+1
| |
* | Merge branch '29364-private-projects-mr-fix'Sean McGivern2017-04-051-1/+3
|/ | | | | | Don’t show source project name when user does not have access See merge request !2081
* Create todos only for new mentionsJarka Kadlecova2017-03-291-1/+1
|
* Allow creating merge request even if target branch is not specified in query ↵Adam Niedzielski2017-03-171-1/+1
| | | | | | params Closes #28890
* Add ability to disable Merge Request URL on pushAlex Sanford2017-03-171-0/+2
|
* Use Enumerable#index_by where possibledm-use-index-byDouwe Maan2017-03-161-4/+1
|
* Merge branch 'fix/mwbs-to-mwps' into 'master' Douwe Maan2017-03-012-12/+12
|\ | | | | | | | | | | | | Rename MWBS to MWPS Closes #24707 See merge request !9335
| * Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-012-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename column in the database Rename fields related to import/export feature Rename API endpoints Rename documentation links Rename the rest of occurrences in the code Replace the images that contain the words "build succeeds" and docs referencing to them Make sure pipeline is green and nothing is missing. updated doc images renamed only_allow_merge_if_build_succeeds in projects and fixed references more updates fix some spec failures fix rubocop offences fix v3 api spec fix MR specs fixed issues with partials fix MR spec fix alignment add missing v3 to v4 doc wip - refactor v3 endpoints fix specs fix a few typos fix project specs copy entities fully to V3 fix entity error more fixes fix failing specs fixed missing entities in V3 API remove comment updated code based on feedback typo fix spec
* | Enable and autocorrect the CustomErrorClass copSean McGivern2017-03-011-2/+1
|/
* Use exceptions for MergeService error handling28769-raise-custom-exception-in-all-methods-of-mergeservice-that-want-to-inform-the-userSean McGivern2017-02-281-11/+9
| | | | | | If any method called by `MergeService#execute` raises a `MergeError`, that error's message will be logged, the model will be updated, and the merge will fail.
* Only create unmergeable todos onceonly-create-unmergeable-todo-onceSean McGivern2017-02-241-1/+5
| | | | | | | | | | | | | | | | | | Previously, we created an unmergeable todo when a merge request: 1. Had merge when pipeline succeeds set. 2. Became unmergeable. However, when merge when pipeline succeeds fails due to unmergeability, the flag isn't actually removed. And a merge request can become unmergeable multiple times, as every time the target branch is updated we need to re-check the mergeable status. This means that if the todo was marked done, and the MR was checked again, a new todo would be created for the same event. Instead of checking this, we should create the todo from the service responsible for merging when the pipeline succeeds. That way the todo is guaranteed to only be created when we care about it.
* Create compare object with default branch when target branch is missingissue_28051_2Felipe Artur2017-02-211-11/+15
|
* Merge branch 'fix-merge-service-with-no-source' into 'master' Rémy Coutable2017-02-171-1/+1
|\ | | | | | | | | Fix merge service error with no source See merge request !9348
| * Fix merge service error with no sourcefix-merge-service-with-no-sourceSean McGivern2017-02-171-1/+1
| | | | | | | | | | This shouldn't be possible in CE, but is needed so that the code is the same in CE and EE.
* | Merge branch 'master' into fix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-172-9/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (313 commits) Allow slashes in slash command arguments Add API endpoint to get all milestone merge requests remove trailing comma Restore pagination to admin abuse reports replace deprecated NoErrorsPlugin with NoEmitOnErrorsPlugin only compress assets in production Reduce number of pipelines created to test pagination add CHANGELOG.md entry for !8761 prevent diff unfolding link from appearing for deleted files fix build failures only show diff unfolding link if there are more lines to show fix typo in node section Only yield valid references in ReferenceFilter.references_in Cache js selectors; fix css move "Install node modules" step before "Migrate DB" within update process Renders pagination again for pipelines table update migration docs for 8.17 to include minimum node version Add CHANGELOG file Fix positioning of top scroll button Remove comments in migration ...
| * Show merge errors in merge request widgetSean McGivern2017-02-161-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * Mark as WIP based on MR commits onlyJarka Kadlecova2017-02-131-1/+5
| |
* | Make it possible to resolve all todos for pipelineGrzegorz Bizon2017-02-151-0/+6
|/
* Backport changes from EE squashSean McGivern2017-02-031-4/+10
| | | | | | | Backport changes from the EE-only squash implementation, which would otherwise conflict when merge CE into EE. <https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1024>
* Merge remote-tracking branch 'upstream/master' into ↵fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-021-57/+72
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (190 commits) Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion. update spec Change the reply shortcut to focus the field even without a selection. use destroy_all Remove settings cog from within admin scroll tabs; keep links centered add changelog remove old project members from project add spec replicating validation error Fix small typo on new branch button spec Improve styling of the new issue message Don't capitalize environment name in show page Abillity to promote project labels to group labels Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. 19164 Add settings dropdown to mobile screens cop for gem fetched from a git source Add CHANGELOG entry ...
| * refactor merge request build serviceRydkin Maxim2017-01-311-57/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add changelog entry replace local variables `merge_request` with instance ones modify `MergeRequests::BuildService` to fix failed tests extract `assign_target_project` method remove unnecessary instance variables remove exclamation marks and rewrite conditionals to improve readability extract `params_does_not_contain_branches?` method, rename `unprepared_merge_request` method to `uncreatable_merge_request` replace instance variables `merge_request` and `error_messages` with getters and setters; divide `set_title_and_description` method on two separate ones refactor `execute` method return `set_title_and_description` method rename `branches_selected?` method to `branches_present?` to make it more different from `branches_specified?` fixes after discussion renamed method branches_valid? fix space return assigning methods into `execute` method simplify `find_target_branch` and `find_source_project` methods fix spec `merge request issuable record that supports slash commands in its description and notes`
* | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-01-263-23/+49
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (1122 commits) Update CHANGELOG.md for 8.16.2 Display project ID in project settings (!8572) fixed points from comments to improve code quality Update CHANGELOG.md for 8.14.8 Statisfy eslint Add CHANGELOG entry Fix access to the wiki code via HTTP when repository feature disabled Display fullscreen button on small screens (!5302) Prevent removing fields from dropdowns on input elements fix for all themes Return struct instead of multiple values Fix race conditions for AuthorizedProjectsWorker Add User#nested_groups and User#nested_projects methods Fix spec failure due to timestamp ordering issue in mySQL Fixed error with filter keyboard tests `can?` already includes the `feature_available?` check Test there is no Merge Request button when MRs are disabled Ensure the correct Merge Request button is found Add 409 conflict tests Add CHANGELOG ...
| * Backport EE changes on approvals reset for closed MRsbackport-ee-1051-approvals-reset-on-closed-mrOswaldo Ferreira2017-01-232-23/+15
| |
| * Mark MR as WIP when pushing WIP commitsjurre2017-01-191-0/+19
| |
| * support `/merge` slash comand for MRsJarka Kadlecova2017-01-111-0/+15
| |
* | Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-043-6/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1031 commits) Add changelog entry for renaming API param [ci skip] Add missing milestone parameter Refactor issues filter in API Fix project hooks params Gitlab::LDAP::Person uses LDAP attributes configuration Don't delete files from spec/fixtures Copy, don't move uploaded avatar files Minor improvements to changelog docs Rename logo, apply for Slack too Fix Gemfile.lock for the octokit update Fix cross-project references copy to include the project reference Add logo in public files Use stable icon for Mattermost integration rewrite the item.respond_to?(:x?) && item.x? to item.try(:x?) API: extern_uid is a string Increases pipeline graph drowdown width in order to prevent strange position on chrome on ubuntu Removed bottom padding from merge manually from CLI because of repositioning award emoji's Make haml_lint happy Improve spec Add feature tests for Cycle Analytics ...
| * Check if user can read issue before being assignedissue_22664Felipe Artur2016-12-271-4/+0
| |
| * Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-162-2/+2
| |
* | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-101-4/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (60 commits) Refactor SSH keys docs Improvements to setting up ssh Do not reload diff for merge request made from fork when target branch in fork is updated Add 8.12.10, 8.12.11, and 8.12.12 CHANGELOG.md items Changes after review Fix broken test Adds CHANGELOG entry Adds tests Uniformize props name format Replace commit icon svg logic Replace play icon svg logic Update docs to reflect new defaults on omnibus Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security' Merge branch 'html-safe-diff-line-content' into 'security' Merge branch 'rs-filter-authentication_token' into 'security' Merge branch 'destroy-session' into 'security' remove unnecessary issues event filter on comments tab Updating reference to database password Add CHANGELOG entry Displays milestone remaining days only when it's present ...
| * Do not reload diff for merge request made from fork when target branch in ↵do-not-refresh-main-when-fork-target-branch-updatedAdam Niedzielski2016-12-091-4/+6
| | | | | | | | | | | | | | | | | | | | | | fork is updated The target branch of a merge request has to be a branch in the project for which the merge request is submitted. When a branch changes in a fork, it does not make sense to reload diffs of merge requests in the upstream project that use the same branch name as the target branch. Please note that it does make sense to reload diffs when the source branch changes.
* | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-081-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-hooks-when-creating-file * upstream/master: (116 commits) adds impersonator variable and makes sudo usage overall more clear Reenables /user API request to return private-token if user is admin and requested with sudo Fix Backup::Manager#remove_old Allow public access to some Tag API endpoints Update outdated visible content spec descriptions Grapify the issues API new DevOps report, 404s, typos Remove dashboard.scss Update custom_hooks.md for global custom hooks and chained hook info Move admin hooks spinach to rspec Move admin logs spinach test to rspec Fix 404 error when visit group label edit page A simpler implementation of finding a merge request Encourage bug reporters to mention if they use GitLab.com [ci skip] Bump gitlab-shell version to 4.0.3 Remove confirmation.scss Explain "js: true" in "deleted_source_branch_spec.rb" [ci skip] Move award emojis to framwork Move image styles to framework Remove tags.scss ...
| * Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master' Kamil Trzciński2016-12-051-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename MWBS service to Merge When Pipeline Succeeds ## What does this MR do? This MR renames Merge When Build Succeeds feature to Merge When Pipeline Succeeds, because we recently changed the behavior, see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6675. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] All builds are passing ## What are the relevant issue numbers? Closes #23354 See merge request !7135
| | * Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-302-3/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (110 commits) Rewrite an HTTP link to use HTTPS Edit /spec/features/profiles/preferences_spec.rb to match changes in 084d90ac Add blue back to sub nav active Remove JSX/React eslint plugins. Fix a transient spec failure Adds hoverstates for collapsed Issue/Merge Request sidebar Moved groups above projects Add StackProf to the Gemfile, along with a utility to get a profile for a spec Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1 Add a CHANGELOG entry Alert user when logged in user email is not the same as the invitation Expose timestamp in build entity used by serializer Rename `MergeRequest#pipeline` to `head_pipeline` Remove unnecessary database indexes CE-specific changes gitlab-org/gitlab-ee#1137 Fixing typo & Clarifying Key name fix started_at check fix blob controller spec failure - updated not to use file-path- fix blob controller spec failure Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security' ... Conflicts: app/controllers/projects/merge_requests_controller.rb lib/api/merge_requests.rb spec/requests/api/merge_requests_spec.rb
| | * \ Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-253-17/+15
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (312 commits) Fix bad selection on dropdown menu for tags filter Fixed issue boards scrolling with a lot of lists & issues You can only assign default_branch when editing a project ... Don't convert data which already is the target type Stop supporting Google and Azure as backup strategies renames some of the specs and adds changelog entry Fixed dragging issue moving wrong issue after multiple drags of issue Fixed issue boards issue sorting when dragging issue into list Rephrase some system notes to be compatible with new system note style Add missing JIRA file that redirects to the new location Fix documentation to create the `pg_trm` extension before creating the DB Document that we always use `do...end` for `before` in RSpec Backport Note#commands_changes from EE Log mv_namespace parameters Add default_branch attr to Project API payload in docs. Fix title case to sentence case properly escape username validation error message flash Remove header ids from University docs Add missing documentation. Added test that checks the correct select box is there for the LFS ... ... Conflicts: app/services/system_note_service.rb spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb spec/services/merge_requests/merge_when_pipeline_succeeds_service_spec.rb spec/services/system_note_service_spec.rb
View Lorry Controller Status