summaryrefslogtreecommitdiff
path: root/log
diff options
context:
space:
mode:
authorAriejan de Vroom <ariejan@ariejan.net>2012-03-01 16:00:14 +0100
committerAriejan de Vroom <ariejan@ariejan.net>2012-03-01 16:00:14 +0100
commitb0ce61c4f20abe1ca5c99631517b49c99f8b23ef (patch)
treef43439eba70d0815da2528d8110c456440a3ff12 /log
parentbfe0906f2ff7a79064c1866c0278cd0c9440b246 (diff)
parentf5a16663f0b038aeb397bda19ebdefa6ad873955 (diff)
downloadgitlab-ce-b0ce61c4f20abe1ca5c99631517b49c99f8b23ef.tar.gz
Merge branch 'deploy_keys_nonunique' of https://github.com/miks/gitlabhq into miks-deploy_keys_nonunique
Added/fixed specs Update spec/factory to allow Factory#new without opts Conflicts: app/models/key.rb
Diffstat (limited to 'log')
0 files changed, 0 insertions, 0 deletions