deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

rename ProjectController to ProjectResourceController

Browse source
This commit is contained in:
Cyril 2012-09-27 20:59:42 +02:00
parent 933c5e4146
commit be18397d82
22 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/merge_requests_controller.rb
View file

@ -1,4 +1,4 @@
class MergeRequestsController < ProjectController
class MergeRequestsController < ProjectResourceController
before_filter :module_enabled
before_filter :merge_request, only: [:edit, :update, :destroy, :show, :commits, :diffs, :automerge, :automerge_check, :raw]
before_filter :validates_merge_request, only: [:show, :diffs, :raw]