Download as
Browse Code »

Commit 9b598fa62d73c5a66d7fed872db943859e2d6a5a

Authored by Dmitriy Zaporozhets
1 parent 9ee697dd
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Fix MR fork validation and services load 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 5 changed files with 11 additions and 7 deletions   Show diff stats
app/models/merge_request.rb
  Diff comments   View file @9b598fa
@@ -127,7 +127,9 @@ class MergeRequest &lt; ActiveRecord::Base @@ -127,7 +127,9 @@ class MergeRequest &lt; ActiveRecord::Base
127 end 127 end
128 128
129 def validate_fork 129 def validate_fork
130 - if target_projet == source_project 130 + return true unless target_project && source_project
  131 +
  132 + if target_project == source_project
131 true 133 true
132 else 134 else
133 # If source and target projects are different 135 # If source and target projects are different
app/services/merge_requests/create_service.rb
  Diff comments   View file @9b598fa
1 -module MergeReques 1 +module MergeRequests
2 class CreateService < MergeRequests::BaseService 2 class CreateService < MergeRequests::BaseService
3 def execute 3 def execute
4 merge_request = MergeRequest.new(params) 4 merge_request = MergeRequest.new(params)
app/services/merge_requests/update_service.rb
  Diff comments   View file @9b598fa
  1 +require_relative 'base_service'
  2 +require_relative 'reopen_service'
  3 +require_relative 'close_service'
  4 +
1 module MergeRequests 5 module MergeRequests
2 class UpdateService < MergeRequests::BaseService 6 class UpdateService < MergeRequests::BaseService
3 def execute(merge_request) 7 def execute(merge_request)
features/steps/dashboard/merge_requests.rb
  Diff comments   View file @9b598fa
@@ -53,15 +53,15 @@ class DashboardMergeRequests &lt; Spinach::FeatureSteps @@ -53,15 +53,15 @@ class DashboardMergeRequests &lt; Spinach::FeatureSteps
53 end 53 end
54 54
55 def assigned_merge_request 55 def assigned_merge_request
56 - @assigned_merge_request ||= create :merge_request, assignee: current_user, target_project: project 56 + @assigned_merge_request ||= create :merge_request, assignee: current_user, target_project: project, source_project: project
57 end 57 end
58 58
59 def authored_merge_request 59 def authored_merge_request
60 - @authored_merge_request ||= create :merge_request, author: current_user, target_project: project 60 + @authored_merge_request ||= create :merge_request, source_branch: 'simple_merge_request', author: current_user, target_project: project, source_project: project
61 end 61 end
62 62
63 def other_merge_request 63 def other_merge_request
64 - @other_merge_request ||= create :merge_request, target_project: project 64 + @other_merge_request ||= create :merge_request, source_branch: '2_3_notes_fix', target_project: project, source_project: project
65 end 65 end
66 66
67 def project 67 def project
features/support/env.rb
  Diff comments   View file @9b598fa
@@ -52,6 +52,4 @@ Spinach.hooks.before_run do @@ -52,6 +52,4 @@ Spinach.hooks.before_run do
52 RSpec::Mocks::setup self 52 RSpec::Mocks::setup self
53 53
54 include FactoryGirl::Syntax::Methods 54 include FactoryGirl::Syntax::Methods
55 - MergeRequestObserver.any_instance.stub(current_user: create(:user))  
56 end 55 end
57 -