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
..
_activities.html.haml	DB performance improvements to GitLab	2015-02-18 00:16:42 -08:00
_groups.html.haml	Add new style to "New group" button	2015-02-17 20:52:03 +01:00
_project.html.haml	Merge branch 'master' into rails-4.1.9	2015-02-19 20:53:05 -07:00
_projects.html.haml	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
_projects_filter.html.haml	Refactor sorting in project	2015-02-05 19:15:05 -08:00
_sidebar.html.haml	Restyle group page and event filter	2014-12-16 18:15:48 +02:00
_zero_authorized_projects.html.haml	Add "New Project" button to dashboard projects page.	2015-02-13 15:43:02 +01:00
issues.atom.builder	Fix xmlns:media namespacing for atom feeds	2014-12-31 15:05:38 -05:00
issues.html.haml	Refactor issues and merge requests lists	2014-12-23 18:49:39 +02:00
merge_requests.html.haml	Refactor issues and merge requests lists	2014-12-23 18:49:39 +02:00
projects.html.haml	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
show.atom.builder	Fix xmlns:media namespacing for atom feeds	2014-12-31 15:05:38 -05:00
show.html.haml	Upgrade to Font Awesome v4.2	2014-10-03 12:19:24 +02:00