diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-06-08 20:16:36 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-06-08 20:16:36 +0300 |
| commit | 8cd6ffab51acade21f793103d4fedf6c04a20496 (patch) | |
| tree | 13a427ae7f5691e3fc3b2ca17b9a49e0fd42feb6 /app/assets/javascripts/merge_conflicts | |
| parent | b32f3685aee483a06558d181c4ec72bfb255a007 (diff) | |
| parent | b00b861863bd963224593846791ea0b6993d9b88 (diff) | |
Merge branch 'rs-schema-spec-parity' into 'master'
Refactor schema_spec.rb for CE-EE parity and simplicity
See merge request gitlab-org/gitlab-ce!19563
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
0 files changed, 0 insertions, 0 deletions