diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-01-26 19:13:02 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-01-26 19:13:02 +0800 |
| commit | acda0cd48d69dbd98ec9df8339f15139cd098726 (patch) | |
| tree | 7ef5d7f6e05e11fab4c28d7a8ab8f8a7efbb04e6 /app/controllers | |
| parent | 4587c78afa5ff5d2bab718bd632264764860d775 (diff) | |
| download | gitlab-ce-acda0cd48d69dbd98ec9df8339f15139cd098726.tar.gz | |
@tree_edit_project is no longer used
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7237#note_21626434
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/creates_commit.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 2ece99aebc0..fa7c22b5388 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -101,7 +101,6 @@ module CreatesCommit def set_commit_variables if can?(current_user, :push_code, @project) # Edit file in this project - @tree_edit_project = @project @mr_source_project = @project if @project.forked? @@ -114,10 +113,8 @@ module CreatesCommit @mr_target_branch = @ref || @target_branch end else - # Edit file in fork - @tree_edit_project = current_user.fork_of(@project) # Merge request from fork to this project - @mr_source_project = @tree_edit_project + @mr_source_project = current_user.fork_of(@project) @mr_target_project = @project @mr_target_branch = @ref || @target_branch end |