diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-30 16:36:01 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-30 16:36:01 +0000 |
| commit | 16335b3c4d9e9ed13093445ca5198642cee795f9 (patch) | |
| tree | 7f23aa792a9e7295ee261d21685ccdb2e0536c19 /app | |
| parent | c2173a1464abe4048486ffe350ad65545ce239ce (diff) | |
| parent | 781cca8d4549ffb55f6b594c0c740f630d5531c7 (diff) | |
| download | gitlab-ce-16335b3c4d9e9ed13093445ca5198642cee795f9.tar.gz | |
Merge branch 'issue_25578' into 'master'
Fix redirect after update file when user has forked project
Closes #25578
See merge request !8371
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? |