summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-01-30 20:12:55 +0000
committerRobert Speicher <robert@gitlab.com>2018-01-30 20:12:55 +0000
commita20e02a5bc2e52f679ee220f61abeb9ecfff1ec9 (patch)
tree8c7dccf6d01d97e6214047908be2fdfa9297a22f /spec
parentd2a2f22fe6b2e93630b32bc699d091720b01b6d3 (diff)
parent804c6f93b72677a836ebe0aa8c6c7cdd0d07b8a1 (diff)
downloadgitlab-ce-a20e02a5bc2e52f679ee220f61abeb9ecfff1ec9.tar.gz
Merge branch 'rc/ignore-schema-in-ee_compat_check' into 'master'
Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck See merge request gitlab-org/gitlab-ce!16806
Diffstat (limited to 'spec')
0 files changed, 0 insertions, 0 deletions