deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3726 commits 6 branches 43 tags 25 MiB
Commit graph

3 commits

Author SHA1 Message Date
Dmitriy Zaporozhets 752eb2c11d more tests fixed 2013-01-15 16:36:35 +02:00
Riyad Preukschas 3022786948 Merge commit 'master' into discussions 
Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
 2013-01-15 00:52:25 +01:00
Dmitriy Zaporozhets cac7723451 Get rid of roles 2013-01-02 23:35:11 +02:00
Renamed from spec/roles/votes_spec.rb (Browse further)