OSDN Git Service

Merge branch 'extend_user_api' of https://github.com/bladealslayer/gitlabhq into...
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Thu, 31 Jan 2013 11:00:50 +0000 (13:00 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Thu, 31 Jan 2013 11:00:50 +0000 (13:00 +0200)
commitfd1b9fdc12f0fac112810851903203bc256b6548
treeead4e97e0b6a6cc22f080e33135756d9b0702d9e
parentafdb09de80191d9424c34b7bab3e2f8d5fd1c782
parente954438a1d3a45addebf52ab04155459d7d84db0
Merge branch 'extend_user_api' of https://github.com/bladealslayer/gitlabhq into bladealslayer-extend_user_api

Conflicts:
spec/requests/api/users_spec.rb
lib/api/entities.rb
spec/requests/api/users_spec.rb