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
..
application_settings	Add link to share via twitter to "created project" event.	2015-02-13 12:07:59 +01:00
applications	Use shorter map() syntax	2015-02-15 20:50:53 -07:00
background_jobs	Use Gitlab.config instead of Settings everywhere	2014-10-15 23:01:31 +02:00
broadcast_messages	Upgrade to Font Awesome v4.2	2014-10-03 12:19:24 +02:00
dashboard	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
groups	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
hooks	Replace ui-box title with panel-heading	2014-05-29 18:43:21 +03:00
keys	Share the key table between admin and profile resources.	2014-12-30 11:01:30 +01:00
logs	Dry admin logs.	2014-10-06 00:14:46 +02:00
projects	Merge branch 'master' into rails-4.1.9	2015-02-19 20:53:05 -07:00
services	Explained in the integration documentation how to enable external issue tracker	2015-02-12 17:06:55 -08:00
users	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00