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

merge_request.rb

  • Pierre de La Morinerie's avatar
    18295585
    Fix MergeRequest#source_sha when there is no diff · 18295585
    Pierre de La Morinerie authored
    `MergeRequest#source_sha` is expected to return the sha of the source
    branch last commit.
    
    But when a open Merge Request has no diff (e.g. all commits have already
    been merged to the target branch), `merge_request.source_sha`
    incorrectly returns `nil`.
    
    This was un-noticed before – but now that !2217 has been merged,
    it makes `Gitlab::Git::Commit.between` raise an
    "Unexpected nil argument" exception.
    
    This fixes the crash, by making sure that `source_sha` returns a
    correct result even when there is no diff available.
    18295585
    History
    Fix MergeRequest#source_sha when there is no diff
    Pierre de La Morinerie authored
    `MergeRequest#source_sha` is expected to return the sha of the source
    branch last commit.
    
    But when a open Merge Request has no diff (e.g. all commits have already
    been merged to the target branch), `merge_request.source_sha`
    incorrectly returns `nil`.
    
    This was un-noticed before – but now that !2217 has been merged,
    it makes `Gitlab::Git::Commit.between` raise an
    "Unexpected nil argument" exception.
    
    This fixes the crash, by making sure that `source_sha` returns a
    correct result even when there is no diff available.
Code owners
Assign users and groups as approvers for specific file changes. Learn more.