gitlab-org--gitlab-foss/app/controllers/explore
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
..
application_controller.rb
groups_controller.rb Merge branch 'master' into issue_12658 2016-03-21 23:22:21 +01:00
projects_controller.rb Use the configured Kaminari "per page" default 2016-03-19 17:37:54 -04:00
snippets_controller.rb