Skip to content
Snippets Groups Projects
Select Git revision
  • ag-test
  • rs-test
  • master default protected
  • test-me-pa
  • mksionek-master-patch-52381
  • new-branch-10
  • test-conflicts
  • test-suggestions
  • alejandro-test
  • patch-25
  • winh-test-image-doscussion
  • stg-lfs-image-test-2
  • stg-lfs-image-test
  • test42016
  • issue_42016
  • issue-32709
  • add-codeowners
  • ClemMakesApps-master-patch-62759
  • bvl-staging-test
  • bvl-merge-base-api
  • v9.2.0-rc6 protected
  • v9.2.0-rc5 protected
  • v9.2.0-rc4 protected
  • v9.2.0-rc3 protected
  • v9.1.4 protected
  • v9.2.0-rc2 protected
  • v9.2.0-rc1 protected
  • v9.1.3 protected
  • v8.17.6 protected
  • v9.0.7 protected
  • v9.1.2 protected
  • v9.1.1 protected
  • v9.2.0.pre protected
  • v9.1.0 protected
  • v9.1.0-rc7 protected
  • v9.1.0-rc6 protected
  • v9.0.6 protected
  • v9.1.0-rc5 protected
  • v9.1.0-rc4 protected
  • v9.1.0-rc3 protected
40 results

28124-mrs-don-t-show-all-merge-errors.yml

  • Sean McGivern's avatar
    7a9d3a3c
    Show merge errors in merge request widget · 7a9d3a3c
    Sean McGivern authored
    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).
    7a9d3a3c
    History
    Show merge errors in merge request widget
    Sean McGivern authored
    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).
Code owners
Assign users and groups as approvers for specific file changes. Learn more.