summaryrefslogtreecommitdiff
path: root/spec/models/build_spec.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-01-27 17:23:59 +0100
committerDouwe Maan <douwe@selenight.nl>2016-01-27 17:23:59 +0100
commit5cce1278adb168cd9fa4f189e3656a59726b4e6c (patch)
tree61e78e71ef377095abf6e3df3bee5a027ce5989a /spec/models/build_spec.rb
parenta93f7099fa2ed98746ebfb5e55322d0afb5068f8 (diff)
downloadgitlab-ce-5cce1278adb168cd9fa4f189e3656a59726b4e6c.tar.gz
Correctly determine MR diff base when MR has merge conflicts
Diffstat (limited to 'spec/models/build_spec.rb')
0 files changed, 0 insertions, 0 deletions