deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into discussions

Browse source 
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
This commit is contained in:
Riyad Preukschas 2012-12-23 01:03:57 +01:00
commit db2c15369c
276 changed files with 4466 additions and 2603 deletions
Download patch file Download diff file Expand all files Collapse all files

5
spec/factories.rb
View file

@ -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