Dynamic values must be in blocks if FG
All scopes must be in lambdas
Merge branch 'fix-db-after-updating-rails' of https://github.com/Undev/gitlabhq into Undev-fix-db-after-updating-rails
rename scope to prevent name collision
Merge branch 'Undev-fix-db-after-updating-rails'