summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-15 09:39:30 +0000
committerRémy Coutable <remy@rymai.me>2017-06-15 09:39:30 +0000
commitb5a14e7404fc794a1959db1e4983ca7421c42791 (patch)
tree14feb4ada27b99e7ae051245b6f4ddd55c8e2a38 /app/assets
parent4ac74fe6e809c21e7166157bd326962acd4de14d (diff)
parent9203a5abb8188a6d6a4cc2bf3d968fa5f0a99acd (diff)
downloadgitlab-ce-b5a14e7404fc794a1959db1e4983ca7421c42791.tar.gz
Merge branch 'sh-fix-spec-helper-ee-consistency' into 'master'
Make spec/spec_helper consistent with EE by including a :routing type See merge request !12178
Diffstat (limited to 'app/assets')
0 files changed, 0 insertions, 0 deletions