diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-03 10:36:10 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-03 10:36:10 +0300 |
| commit | 9b598fa62d73c5a66d7fed872db943859e2d6a5a (patch) | |
| tree | 3bcc3a4afeacab716e90d1ef18d78dbcd46c941e /app | |
| parent | 9ee697dd6847de0bd1a38714df7d8bb509534d20 (diff) | |
| download | gitlab-ce-9b598fa62d73c5a66d7fed872db943859e2d6a5a.tar.gz | |
Fix MR fork validation and services load
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request.rb | 4 | ||||
| -rw-r--r-- | app/services/merge_requests/create_service.rb | 2 | ||||
| -rw-r--r-- | app/services/merge_requests/update_service.rb | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index ffed03307ec..0decc7782ee 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -127,7 +127,9 @@ class MergeRequest < ActiveRecord::Base end def validate_fork - if target_projet == source_project + return true unless target_project && source_project + + if target_project == source_project true else # If source and target projects are different diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb index 3717d4d1fc4..6f7121a51d0 100644 --- a/app/services/merge_requests/create_service.rb +++ b/app/services/merge_requests/create_service.rb @@ -1,4 +1,4 @@ -module MergeReques +module MergeRequests class CreateService < MergeRequests::BaseService def execute merge_request = MergeRequest.new(params) diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index 743930f5e8b..bbedca6ffd6 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -1,3 +1,7 @@ +require_relative 'base_service' +require_relative 'reopen_service' +require_relative 'close_service' + module MergeRequests class UpdateService < MergeRequests::BaseService def execute(merge_request) |