Merge branch 'fix/merge-separate-build-spec-files' into 'master'

Browse source

Merge separate build spec files into one in correct location

Closes #24579

See merge request !8564

...

This commit is contained in:

Robert Speicher 2017-01-13 19:52:33 +00:00

parent 6f4f99f402 d69ec1269a

commit 57a2735a42

2 changed files with 1275 additions and 1341 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

1338

spec/models/build_spec.rb

View file

File diff suppressed because it is too large Load diff

1278

spec/models/ci/build_spec.rb

View file

File diff suppressed because it is too large Load diff