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

factorize before_filters and layout for projects related controllers

Browse source
This commit is contained in:
Cyril 2012-09-26 01:21:37 +02:00
parent 0439387be0
commit 078a8f0e66
17 changed files with 33 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/merge_requests_controller.rb
View file

@ -1,13 +1,8 @@
class MergeRequestsController < ApplicationController
before_filter :project
class MergeRequestsController < ProjectController
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]
before_filter :define_show_vars, only: [:show, :diffs]
layout "project"
# Authorize
before_filter :add_project_abilities
# Allow read any merge_request
before_filter :authorize_read_merge_request!