diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-12-29 21:09:13 -0200 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-12-29 21:11:34 -0200 |
| commit | 781cca8d4549ffb55f6b594c0c740f630d5531c7 (patch) | |
| tree | a85af7843958a4ae92e07479895173a0c83866af /app | |
| parent | 713a1e283346dd98c14f362bdff4712ca8f6d67d (diff) | |
| download | gitlab-ce-781cca8d4549ffb55f6b594c0c740f630d5531c7.tar.gz | |
Fix redirect after update file when user has forked project
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/concerns/creates_commit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 936d9bab57e..6f43ce5226d 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -82,7 +82,7 @@ module CreatesCommit return @merge_request if defined?(@merge_request) @merge_request = MergeRequestsFinder.new(current_user, project_id: @mr_target_project.id).execute.opened. - find_by(source_branch: @mr_source_branch, target_branch: @mr_target_branch) + find_by(source_branch: @mr_source_branch, target_branch: @mr_target_branch, source_project_id: @mr_source_project) end def different_project? |