Merge branch 'master' into discussions

Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb

1 files changed, 3 insertions, 2 deletions

diff --git a/spec/factories.rb b/spec/factories.rb
index ac49f14c563..44fb9378870 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -45,6 +45,7 @@ FactoryGirl.define do
   factory :users_project do
     user
     project
+    project_access { UsersProject::MASTER }
   end
 
   factory :issue do
@@ -100,7 +101,7 @@ FactoryGirl.define do
     factory :note_on_merge_request_line, traits: [:on_merge_request, :on_line]
 
     trait :on_commit do
-      noteable_id   "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a"
+      commit_id     "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a"
       noteable_type "Commit"
     end
 
@@ -114,7 +115,7 @@ FactoryGirl.define do
     end
 
     trait :on_issue do
-      noteable_id 1
+      noteable_id   1
       noteable_type "Issue"
     end
   end