OSDN Git Service

Merge branch 'feature/refactoring_scopes_pr' of https://github.com/Undev/gitlabhq...
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Tue, 9 Apr 2013 17:37:04 +0000 (20:37 +0300)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Tue, 9 Apr 2013 17:37:04 +0000 (20:37 +0300)
commit0f2798d498c69372137d13a8ba3ec8e87b7f0a8a
treee2fa3ed8d25c5a54e4b8baf70e710008d1a03754
parent52cd655f71c6a5393b71640c13cd95e35e8d2624
parent85e039049cba5ac1bf92e6cbba2ea1236d6892f7
Merge branch 'feature/refactoring_scopes_pr' of https://github.com/Undev/gitlabhq into Undev-feature/refactoring_scopes_pr

Conflicts:
db/schema.rb
app/models/issue.rb
app/models/project.rb
app/models/user.rb
db/schema.rb
spec/models/project_spec.rb