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

Merge separate build spec files into one in correct location Closes #24579 See merge request !8564

Merge branch 'fix/merge-separate-build-spec-files' into 'master'
Merge separate build spec files into one in correct location Closes #24579 See merge request !8564
57a2735a · Robert Speicher · 6f4f99f4 · d69ec126 · 6f4f99f4 · 57a2735a
Commit 57a2735a authored Jan 13, 2017 by Robert Speicher
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1275 additions and 1341 deletions

spec/models/build_spec.rb spec/models/build_spec.rb +0 -1338

spec/models/ci/build_spec.rb spec/models/ci/build_spec.rb +1275 -3

No files found.
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb