gitlabhq/app/contexts
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
..
notes Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
base_context.rb Feature: Bulk Issues update 2012-07-28 03:35:43 +03:00
commit_load_context.rb Remove unused methods 2013-01-05 13:11:15 +02:00
filter_context.rb Common filtering for dashboard and group. Share partial search result partial 2013-01-07 20:52:43 +02:00
issues_bulk_update_context.rb Fully embrace Ruby 1.9 hash syntax 2012-08-10 18:25:15 -04:00
issues_list_context.rb Remove unused styles. Restyled Issues a bit 2013-01-05 14:49:08 +02:00
merge_requests_load_context.rb Improve styles. Add merge request completness to milestone percentage 2012-10-29 22:40:00 +02:00
project_update_context.rb Admin can move project to ANY namespace. Updated permissions page 2012-12-04 22:48:24 +02:00
search_context.rb Wiki search 2012-10-16 23:05:11 +04:00
test_hook_context.rb Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00