gitlabhq/app/controllers
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
..
admin sidekiq 2013-01-09 08:14:05 +03:00
admin_controller.rb Add an AdminController base class for Admin controllers 2012-09-16 10:06:29 -04:00
application_controller.rb REpostiry, Team models 2013-01-03 21:09:18 +02:00
blame_controller.rb rename ProjectController to ProjectResourceController 2012-09-27 20:59:42 +02:00
blob_controller.rb linguist and web browser will take care of mimetype and encoding problem. 2012-11-10 01:06:20 +08:00
commit_controller.rb Fix comment and reply buttons 2013-01-02 20:49:27 +01:00
commits_controller.rb REpostiry, Team models 2013-01-03 21:09:18 +02:00
compare_controller.rb rename ProjectController to ProjectResourceController 2012-09-27 20:59:42 +02:00
dashboard_controller.rb Event filters stores at cookies. 2013-01-09 19:30:20 +00:00
deploy_keys_controller.rb rename ProjectController to ProjectResourceController 2012-09-27 20:59:42 +02:00
errors_controller.rb layout selected by controller name 2012-09-26 22:27:44 +02:00
groups_controller.rb Common filtering for dashboard and group. Share partial search result partial 2013-01-07 20:52:43 +02:00
help_controller.rb UI: add new button, top panel restyle etc 2012-01-18 22:15:45 +02:00
hooks_controller.rb rename ProjectController to ProjectResourceController 2012-09-27 20:59:42 +02:00
issues_controller.rb Merge branch 'master' into discussions 2012-12-23 01:03:57 +01:00
keys_controller.rb Fully embrace Ruby 1.9 hash syntax 2012-08-10 18:25:15 -04:00
labels_controller.rb project.issues_labels method 2012-10-09 20:39:06 +03:00
merge_requests_controller.rb Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
milestones_controller.rb Processing with note events. reformated dashboard for more events to handle 2012-12-14 21:39:55 +02:00
notes_controller.rb Fix wall notes 2012-12-03 22:51:56 +01:00
omniauth_callbacks_controller.rb Update uses of Gitolite.config.foo settings 2012-12-20 16:54:28 +01:00
profiles_controller.rb Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax 2012-12-02 13:29:24 +02:00
project_resource_controller.rb REpostiry, Team models 2013-01-03 21:09:18 +02:00
projects_controller.rb Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
protected_branches_controller.rb rename ProjectController to ProjectResourceController 2012-09-27 20:59:42 +02:00
refs_controller.rb Fixed tree logs for branches with slash. Fixed remember of path when switch branch 2013-01-09 09:34:26 +02:00
repositories_controller.rb REpostiry, Team models 2013-01-03 21:09:18 +02:00
search_controller.rb Fix api specs. Use id instead path 2013-01-02 19:46:06 +02:00
services_controller.rb Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
snippets_controller.rb Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
team_members_controller.rb Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
tree_controller.rb Fixed protected branches and file edit 2013-01-04 21:45:30 +02:00
wikis_controller.rb rename ProjectController to ProjectResourceController 2012-09-27 20:59:42 +02:00