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

Monkeypatch satellite call for merge request in tests

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-21 11:44:33 +02:00
parent 42ce2c1080
commit 28da2a8bdc
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/merge_requests_controller.rb
View file

@ -1,3 +1,5 @@
require 'gitlab/satellite/satellite'
class MergeRequestsController < ProjectResourceController
before_filter :module_enabled
before_filter :merge_request, only: [:edit, :update, :show, :commits, :diffs, :automerge, :automerge_check, :ci_status]