delta/gitlab/gitlab-ce.git/app/controllers/projects/tree_controller.rb, branch shell-version-warning gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'master' into rails-4.1.9 2015-02-21T19:55:28+00:00 Vinnie Okada vokada@mrvinn.com 2015-02-21T19:55:28+00:00 2a9eed6620fd57c2a82edf5eab95dade3da250d3 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 
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 Douwe Maan douwe@gitlab.com 2015-02-20T15:30:15+00:00 00408f37e34f37f1299df6957f62bfa7ff341749 






Upgrade to Rails 4.1.9
2015-02-14T18:09:23+00:00

Vinnie Okada
vokada@mrvinn.com

2015-01-24T18:02:58+00:00

76aad9b76ed756ca9ba2cbcdb399c815e542b3ae

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.





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.







Explicitly set before_filter for ref-related controllers
2015-01-26T23:01:51+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2015-01-26T23:01:51+00:00

c916124178645412a554a6b8b39c05bbd42269c8












Check if blob or tree and redirect to the correct one.
2014-07-07T13:46:57+00:00

Marin Jankovski
marin@gitlab.com

2014-07-07T13:46:57+00:00

005752e4c6485cf79b0a53583c03b5a69fe19f10












Refactoring for EditTree and NewTree controllers and contexts
2013-11-05T10:21:11+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2013-11-05T10:21:11+00:00

160bd862bede180faf66de7e5b09300347c24279

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Update code to work with gitlab_git 3
2013-10-01T14:00:28+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2013-10-01T14:00:28+00:00

ae9dd6276267e0df2d9c2da3b89393e4ee212175












Move projects controllers/views in Projects module
2013-06-23T16:47:22+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2013-06-23T16:47:22+00:00

2ed7cbfba4ff3c6a4cf3e72515a0375544998de0