Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload ...

# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb

2015-02-24 14:54:39 +01: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

Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404.

2015-02-20 17:20:03 +01:00

blob_controller.rb

Merge branch 'master' into rails-4.1.9

2015-02-21 12:55:28 -07:00

branches_controller.rb

Merge branch 'master' into rails-4.1.9

2015-02-21 12:55:28 -07:00

commit_controller.rb

Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404.

2015-02-20 17:20:03 +01:00

commits_controller.rb

Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404.

2015-02-20 17:20:03 +01:00

compare_controller.rb

Merge branch 'master' into rails-4.1.9

2015-02-21 12:55:28 -07:00

deploy_keys_controller.rb

Upgrade to Rails 4.1.9

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

forks_controller.rb

Merge branch 'master' into rails-4.1.9

2015-02-21 12:55:28 -07:00

graphs_controller.rb

Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404.

2015-02-20 17:20:03 +01: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

Fix updating issue 500 error

2015-02-22 22:26:09 -08: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

Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404.

2015-02-20 17:20:03 +01: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

Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404.

2015-02-20 17:20:03 +01:00

refs_controller.rb

Merge branch 'master' into rails-4.1.9

2015-02-21 12:55:28 -07:00

repositories_controller.rb

Merge branch 'master' into rails-4.1.9

2015-02-21 12:55:28 -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

Merge branch 'master' into rails-4.1.9

2015-02-21 12:55:28 -07:00

uploads_controller.rb

Satisfy Rubocop.

2015-02-20 16:04:03 +01:00

wikis_controller.rb

Upgrade to Rails 4.1.9

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