18295585d9
`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.
101 lines
2.7 KiB
Ruby
101 lines
2.7 KiB
Ruby
# == Schema Information
|
|
#
|
|
# Table name: merge_requests
|
|
#
|
|
# id :integer not null, primary key
|
|
# target_branch :string(255) not null
|
|
# source_branch :string(255) not null
|
|
# source_project_id :integer not null
|
|
# author_id :integer
|
|
# assignee_id :integer
|
|
# title :string(255)
|
|
# created_at :datetime
|
|
# updated_at :datetime
|
|
# milestone_id :integer
|
|
# state :string(255)
|
|
# merge_status :string(255)
|
|
# target_project_id :integer not null
|
|
# iid :integer
|
|
# description :text
|
|
# position :integer default(0)
|
|
# locked_at :datetime
|
|
# updated_by_id :integer
|
|
# merge_error :string(255)
|
|
# merge_params :text
|
|
# merge_when_build_succeeds :boolean default(FALSE), not null
|
|
# merge_user_id :integer
|
|
# merge_commit_sha :string
|
|
#
|
|
|
|
FactoryGirl.define do
|
|
factory :merge_request do
|
|
title
|
|
author
|
|
source_project factory: :project
|
|
target_project { source_project }
|
|
|
|
# $ git log --pretty=oneline feature..master
|
|
# 5937ac0a7beb003549fc5fd26fc247adbce4a52e Add submodule from gitlab.com
|
|
# 570e7b2abdd848b95f2f578043fc23bd6f6fd24d Change some files
|
|
# 6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9 More submodules
|
|
# d14d6c0abdd253381df51a723d58691b2ee1ab08 Remove ds_store files
|
|
# c1acaa58bbcbc3eafe538cb8274ba387047b69f8 Ignore DS files
|
|
#
|
|
# See also RepoHelpers.sample_compare
|
|
#
|
|
source_branch "master"
|
|
target_branch "feature"
|
|
|
|
merge_status "can_be_merged"
|
|
|
|
trait :with_diffs do
|
|
end
|
|
|
|
trait :without_diffs do
|
|
source_branch "improve/awesome"
|
|
target_branch "master"
|
|
end
|
|
|
|
trait :conflict do
|
|
source_branch "feature_conflict"
|
|
target_branch "feature"
|
|
end
|
|
|
|
trait :merged do
|
|
state :merged
|
|
end
|
|
|
|
trait :closed do
|
|
state :closed
|
|
end
|
|
|
|
trait :reopened do
|
|
state :reopened
|
|
end
|
|
|
|
trait :simple do
|
|
source_branch "feature"
|
|
target_branch "master"
|
|
end
|
|
|
|
trait :rebased do
|
|
source_branch "markdown"
|
|
target_branch "improve/awesome"
|
|
end
|
|
|
|
trait :diverged do
|
|
source_branch "feature"
|
|
target_branch "master"
|
|
end
|
|
|
|
trait :merge_when_build_succeeds do
|
|
merge_when_build_succeeds true
|
|
merge_user author
|
|
end
|
|
|
|
factory :merged_merge_request, traits: [:merged]
|
|
factory :closed_merge_request, traits: [:closed]
|
|
factory :reopened_merge_request, traits: [:reopened]
|
|
factory :merge_request_with_diffs, traits: [:with_diffs]
|
|
end
|
|
end
|