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_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

avatars_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

blame_controller.rb

Explicitly set before_filter for ref-related controllers

2015-01-26 15:01:51 -08:00

blob_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

branches_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

commit_controller.rb

Commit page: async load branches info

2015-02-03 09:10:56 -08:00

commits_controller.rb

Apply default scope to labels and remove one for notes

2015-02-05 20:29:41 -08:00

compare_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

deploy_keys_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

forks_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

graphs_controller.rb

remove auth duplication

2014-11-05 11:04:08 +02:00

hooks_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

imports_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

issues_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

labels_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

merge_requests_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

milestones_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

network_controller.rb

Explicitly set before_filter for ref-related controllers

2015-01-26 15:01:51 -08:00

notes_controller.rb

Add Markdown preview to more forms

2014-10-15 23:52:33 -05:00

protected_branches_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

raw_controller.rb

Rubocop: no trailing newlines

2015-02-02 21:53:27 -08:00

refs_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

repositories_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

services_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

snippets_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

tags_controller.rb

Merge branch 'master' into rails-4.1.9

2015-02-19 20:53:05 -07:00

team_members_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

tree_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

wikis_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00