app/controllers/admin · 63c8a05bf7f18ac4093ece1f08b4b5fd8dba5fac · Forest Godfrey / gitlab-ce

Merge branch 'master' into issue_12658 · ae7b2ef6

authored Mar 21, 2016

# 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

ae7b2ef6

Name	Last commit	Last update
..
abuse_reports_controller.rb		Loading commit data...
appearances_controller.rb		Loading commit data...
application_controller.rb		Loading commit data...
application_settings_controller.rb		Loading commit data...
applications_controller.rb		Loading commit data...
background_jobs_controller.rb		Loading commit data...
broadcast_messages_controller.rb		Loading commit data...
builds_controller.rb		Loading commit data...
dashboard_controller.rb		Loading commit data...
deploy_keys_controller.rb		Loading commit data...
groups_controller.rb		Loading commit data...
hooks_controller.rb		Loading commit data...
identities_controller.rb		Loading commit data...
impersonation_controller.rb		Loading commit data...
keys_controller.rb		Loading commit data...
labels_controller.rb		Loading commit data...
logs_controller.rb		Loading commit data...
projects_controller.rb		Loading commit data...
runner_projects_controller.rb		Loading commit data...
runners_controller.rb		Loading commit data...
services_controller.rb		Loading commit data...
spam_logs_controller.rb		Loading commit data...
users_controller.rb		Loading commit data...