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
..
active_tab.rb	Change active tab and nav class to "active"	2012-09-26 16:32:24 -04:00
admin.rb	Spinach: admin logs, admin users	2013-01-09 19:38:27 +02:00
authentication.rb	tests for: Profile -> History	2012-09-27 23:23:11 +03:00
note.rb	refactor feature steps	2012-09-10 08:35:03 -07:00
paths.rb	Merge commit 'master' into discussions	2013-01-15 00:52:25 +01:00
project.rb	A bit of spinach tests	2013-01-09 08:14:05 +03:00