Merge branch 'feature/refactoring_scopes_pr' of https://github.com/Undev/gitlabhq...

Conflicts:
	db/schema.rb

diff --cc app/models/issue.rb
Simple merge

diff --cc app/models/project.rb
Simple merge

diff --cc app/models/user.rb
Simple merge

diff --cc db/schema.rb
index 0f7827a,da4942d..d85af43
--- 1/db/schema.rb
--- 2/db/schema.rb
+++ b/db/schema.rb
@@@ -11,8 -11,8 +11,7 @@@
  #
  # It's strongly recommended to check this file into your version control system.
  
 -ActiveRecord::Schema.define(:version => 20130403003950) do
 -
 +ActiveRecord::Schema.define(:version => 20130404164628) do
- 
    create_table "events", :force => true do |t|
      t.string   "target_type"
      t.integer  "target_id"

diff --cc spec/models/project_spec.rb
Simple merge