OSDN Git Service

(root) / wvm / gitlab.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bfe0906 f5a1666)
Merge branch 'deploy_keys_nonunique' of https://github.com/miks/gitlabhq into miks...
authorAriejan de Vroom <ariejan@ariejan.net>
Thu, 1 Mar 2012 15:00:14 +0000 (16:00 +0100)
committerAriejan de Vroom <ariejan@ariejan.net>
Thu, 1 Mar 2012 15:00:14 +0000 (16:00 +0100)
commitb0ce61c4f20abe1ca5c99631517b49c99f8b23ef
treef43439eba70d0815da2528d8110c456440a3ff12tree | snapshot
parentbfe0906f2ff7a79064c1866c0278cd0c9440b246commit | diff
parentf5a16663f0b038aeb397bda19ebdefa6ad873955commit | diff
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
app/models/key.rb diff1 | diff2 | blob | history
db/schema.rb diff1 | diff2 | blob | history
spec/factory.rb diff1 | diff2 | blob | history
spec/models/key_spec.rb diff1 | diff2 | blob | history
About OSDN
Find Software
Develop Software
Help