Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9 ... Conflicts: app/views/dashboard/_project.html.haml app/views/events/event/_common.html.haml app/views/explore/projects/_project.html.haml app/views/groups/_projects.html.haml app/views/projects/_home_panel.html.haml app/views/projects/_issues_nav.html.haml app/views/projects/issues/_discussion.html.haml app/views/projects/issues/_issues.html.haml app/views/projects/issues/show.html.haml app/views/projects/merge_requests/_discussion.html.haml app/views/projects/merge_requests/_show.html.haml app/views/projects/milestones/index.html.haml app/views/projects/notes/_edit_form.html.haml app/views/shared/_issuable_filter.html.haml		2015-02-19 20:53:05 -07:00
..
application_controller.rb	Added the correct hierarchy of controllers for the administrative part	2013-01-24 22:31:24 +02:00
application_settings_controller.rb	Add link to share via twitter to "created project" event.	2015-02-13 12:07:59 +01:00
applications_controller.rb	Small improvements to CI	2015-01-17 16:17:34 -08:00
background_jobs_controller.rb	Use Gitlab.config instead of Settings everywhere	2014-10-15 23:01:31 +02:00
broadcast_messages_controller.rb	Use strong params for 5 more models	2014-06-26 15:00:09 +03:00
dashboard_controller.rb	Explicitly define ordering in models using default_scope	2015-02-05 14:20:55 -08:00
groups_controller.rb	Refactor sorting in project	2015-02-05 19:15:05 -08:00
hooks_controller.rb	Project hook, milestone, snippet strong params	2014-06-26 18:51:11 +03:00
keys_controller.rb	Move user key manipulation in admin section to a separate controller.	2014-12-30 10:15:11 +01:00
logs_controller.rb	Added the correct hierarchy of controllers for the administrative part	2013-01-24 22:31:24 +02:00
projects_controller.rb	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
services_controller.rb	Use the service_name.	2015-02-12 10:57:08 -08:00
users_controller.rb	Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S).	2015-02-13 14:44:42 +01:00