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

6
spec/models/note_spec.rb
View file

@ -80,13 +80,13 @@ describe Note do
let!(:commit) { note.noteable }
it "should be accessible through #noteable" do
note.noteable_id.should == commit.id
note.commit_id.should == commit.id
note.noteable.should be_a(Commit)
note.noteable.should == commit
end
it "should save a valid note" do
note.noteable_id.should == commit.id
note.commit_id.should == commit.id
note.noteable == commit
end
@ -104,7 +104,7 @@ describe Note do
let!(:commit) { note.noteable }
it "should save a valid note" do
note.noteable_id.should == commit.id
note.commit_id.should == commit.id
note.noteable.id.should == commit.id
end