gitlab-org--gitlab-foss/app/views/events
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
..
event Merge branch 'master' into rails-4.1.9 2015-02-19 20:53:05 -07:00
_commit.html.haml Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
_event.html.haml Add link to share via twitter to "created project" event. 2015-02-13 12:07:59 +01:00
_event_issue.atom.haml Increase atom feed test coverage. Prevent 500 error if description is missing 2014-09-20 11:55:58 +03:00
_event_last_push.html.haml Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
_event_merge_request.atom.haml Increase atom feed test coverage. Prevent 500 error if description is missing 2014-09-20 11:55:58 +03:00
_event_note.atom.haml Fix missing links and incorrect display of issue numbers for notes, comments, and merge requests 2014-07-26 12:43:04 -05:00
_event_push.atom.haml Upgrade to Rails 4.1.9 2015-02-14 11:09:23 -07:00
_events.html.haml Drop rjs from Infinite scrolling 2013-11-28 11:38:20 +02:00