deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
gitlabhq/app
History
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
..
assets Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
contexts Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
controllers Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
decorators REpostiry, Team models 2013-01-03 21:09:18 +02:00
helpers Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
mailers Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
models Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
observers Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
uploaders Show images preview in notes. Show line additions/deletions for commit 2013-01-04 22:13:32 +02:00
views Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
workers sidekiq 2013-01-09 08:14:05 +03:00