summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2017-12-11 16:45:07 +0000
committerNick Thomas <nick@gitlab.com>2017-12-11 16:45:07 +0000
commitbd8b6518855bd9768ca5d245467b5ff0934e40b6 (patch)
tree5a6ffa8da66ea207a85a6bf3c6f560a745f7ffbf /app/helpers
parentd9f40fddb704a60a38a95dd6433ff40ce65d738d (diff)
parentbcbe5672ecaa3174cd0c2624a8cf6d0568e83654 (diff)
downloadgitlab-ce-bd8b6518855bd9768ca5d245467b5ff0934e40b6.tar.gz
Merge branch 'bw-fix-key-count-service-spec' into 'master'ch-test-me
small change to make less conflict with EE version See merge request gitlab-org/gitlab-ce!15809
Diffstat (limited to 'app/helpers')
0 files changed, 0 insertions, 0 deletions