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
..
group_members	Upgrade to Font Awesome v4.2	2014-10-03 12:19:24 +02:00
milestones	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
_new_group_member.html.haml	Spelling improvement, add in a group, not into group.	2015-02-03 16:55:31 -08:00
_projects.html.haml	Merge branch 'master' into rails-4.1.9	2015-02-19 20:53:05 -07:00
_settings_nav.html.haml	Add titles to links. Closes #1018.	2015-01-24 16:45:21 +02:00
edit.html.haml	Add project-avatar and group-avatar css classes	2015-02-07 11:38:58 -08:00
issues.atom.builder	DRY and refactor atom code	2014-12-04 22:14:20 +02:00
issues.html.haml	Refactor issues and merge requests lists	2014-12-23 18:49:39 +02:00
members.html.haml	Merge pull request #7866 from cirosantilli/input-button-to-tag	2014-10-28 12:11:15 +02:00
merge_requests.html.haml	Refactor issues and merge requests lists	2014-12-23 18:49:39 +02:00
new.html.haml	Merge pull request #8113 from cirosantilli/factor-group-forms	2014-10-21 11:39:41 +03: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	DB performance improvements to GitLab	2015-02-18 00:16:42 -08:00