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
..
active_tab.rb	Prefix Spinach features with Spinach::Features::.	2014-09-22 16:30:25 +02:00
archived_projects.rb	Make Spinach test names consistent	2014-10-05 18:21:11 +02:00
dashboard.rb	Merge branch 'master' into rails-4.1.9	2015-02-19 20:53:05 -07:00
event_filters.rb	Factor '0' * 40 blank ref constants	2014-11-03 20:37:08 +01:00
help.rb	Make Spinach test names consistent	2014-10-05 18:21:11 +02:00
issues.rb	Improvements to issues/mr filters:	2014-12-24 11:39:03 +02:00
merge_requests.rb	Fix scroll problems and disable authorized_only filter	2014-12-24 12:56:03 +02:00
projects.rb	Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step	2014-09-22 20:56:12 +03:00
shortcuts.rb	Prefix Spinach features with Spinach::Features::.	2014-09-22 16:30:25 +02:00