Skip to content
Snippets Groups Projects
Select Git revision
  • move-gl-dropdown
  • improve-table-pagination-spec
  • move-markdown-preview
  • winh-fix-merge-request-spec
  • master default
  • index-namespaces-lower-name
  • winh-single-karma-test
  • 10-3-stable
  • 36782-replace-team-user-role-with-add_role-user-in-specs
  • winh-modal-internal-state
  • tz-ide-file-icons
  • 38869-milestone-select
  • update-autodevops-template
  • jivl-activate-repo-cookie-preferences
  • qa-add-deploy-key
  • docs-move-article-ldap
  • 40780-choose-file
  • 22643-manual-job-page
  • refactor-cluster-show-page-conservative
  • dm-sidekiq-versioning
  • v10.4.0.pre
  • v10.3.0
  • v10.3.0-rc5
  • v10.3.0-rc4
  • v10.3.0-rc3
  • v10.3.0-rc2
  • v10.2.5
  • v10.3.0-rc1
  • v10.0.7
  • v10.1.5
  • v10.2.4
  • v10.2.3
  • v10.2.2
  • v10.2.1
  • v10.3.0.pre
  • v10.2.0
  • v10.2.0-rc4
  • v10.2.0-rc3
  • v10.1.4
  • v10.2.0-rc2
40 results

merge_requests_controller_spec.rb

Blame
Forked from GitLab.org / GitLab FOSS
Source project has a limited visibility.
  • Rémy Coutable's avatar
    e3d464d8
    Fix a wrong MR status when merge_when_build_succeeds &... · e3d464d8
    Rémy Coutable authored
    Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true
    
    The issue was that `MergeRequest#mergeable?` returns false when the CI
    state is not success and project.only_allow_merge_if_build_succeeds is
    true. In this case `Projects::MergeRequestsController#merge` would
    return the `:failed` status when enabling `merge_when_build_succeeds`,
    thus leading to a weird state and the MR never automatically merged.
    
    The fix is to disable the CI state check in the controller safeguard
    that early return the `:failed` status.
    
    Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
    Verified
    e3d464d8
    History
    Fix a wrong MR status when merge_when_build_succeeds &...
    Rémy Coutable authored
    Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true
    
    The issue was that `MergeRequest#mergeable?` returns false when the CI
    state is not success and project.only_allow_merge_if_build_succeeds is
    true. In this case `Projects::MergeRequestsController#merge` would
    return the `:failed` status when enabling `merge_when_build_succeeds`,
    thus leading to a weird state and the MR never automatically merged.
    
    The fix is to disable the CI state check in the controller safeguard
    that early return the `:failed` status.
    
    Signed-off-by: default avatarRémy Coutable <remy@rymai.me>