Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 ... # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb		2016-03-21 23:22:21 +01:00
..
abuse_reports_controller.rb	Clearify who deletes the user	2016-03-15 21:09:25 +01:00
appearances_controller.rb	Branded login page also in CE	2016-02-26 15:50:51 +01:00
application_controller.rb	…
application_settings_controller.rb	Prevent projects to have higher visibility than groups	2016-03-10 10:38:36 -03:00
applications_controller.rb	…
background_jobs_controller.rb	…
broadcast_messages_controller.rb	Allow limited Markdown in Broadcast Messages	2016-02-06 14:30:07 -05:00
builds_controller.rb	Show 'All' tab by default in the builds page	2016-01-04 10:21:10 -02:00
dashboard_controller.rb	…
deploy_keys_controller.rb	…
groups_controller.rb	Merge branch 'master' into issue_12658	2016-03-21 23:22:21 +01:00
hooks_controller.rb	…
identities_controller.rb	Code style fixes and some code simplified	2016-01-08 16:26:04 -02:00
impersonation_controller.rb	…
keys_controller.rb	…
labels_controller.rb	Use the configured Kaminari "per page" default	2016-03-19 17:37:54 -04:00
logs_controller.rb	…
projects_controller.rb	Merge branch 'master' into issue_12658	2016-03-21 23:22:21 +01:00
runner_projects_controller.rb	…
runners_controller.rb	…
services_controller.rb	…
spam_logs_controller.rb	Refactor Admin::SpamLogsController to block user before destroying	2016-02-02 11:25:44 -02:00
users_controller.rb	Merge branch '4009-external-users' into 'master'	2016-03-17 14:15:38 +00:00