delta/gitlab/gitlab-ce.git/app/controllers/projects/compare_controller.rb, branch improve-diff-header

Merge branch 'master' into rails-4.1.9

2015-02-21T19:55:28+00:00

Conflicts:
	app/views/projects/commits/_commit.html.haml
	app/views/projects/issues/_issue.html.haml
	app/views/projects/issues/_issue_context.html.haml
	app/views/projects/merge_requests/_merge_request.html.haml
	app/views/projects/merge_requests/show/_context.html.haml

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

2015-02-20T16:20:03+00:00

Upgrade to Rails 4.1.9

2015-02-14T18:09:23+00:00

Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.

remove auth duplication

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

Factor authorize_push! and authorize_code_access!

2014-10-13T19:31:49+00:00

with existing method_missing. Pattern already used extensively,
so let's be consistent and use it everywhere.

Fix variable order on compare page

2014-07-29T09:42:01+00:00

Signed-off-by: Dmitriy Zaporozhets

Use CompareService for compare page

2014-07-29T09:33:51+00:00

Signed-off-by: Dmitriy Zaporozhets

Refactor diff suppress logic and diff views

2014-07-15T15:28:21+00:00

Signed-off-by: Dmitriy Zaporozhets

Use gitlab_git 5.4.0 without BROKEN_DIFF constant

2014-02-12T10:54:49+00:00

Signed-off-by: Dmitriy Zaporozhets

Prevent 500 error on Compare page if diff read timout happens

2014-02-05T14:21:41+00:00

Signed-off-by: Dmitriy Zaporozhets