diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-10 18:02:46 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-19 13:14:53 -0500 |
| commit | b8295fc3232a3d9ca2af524225f9a66ab7735926 (patch) | |
| tree | 8f8d9109dff563618bdaa585c17305ddff8d8133 /app/controllers/concerns | |
| parent | ccd2a8d6b577e9a5a0ea3a350e6bc039550bc1ae (diff) | |
| download | gitlab-ce-b8295fc3232a3d9ca2af524225f9a66ab7735926.tar.gz | |
Fix build and add specs
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/creates_commit.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 4d7b1b80ded..4410e4d6505 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -82,7 +82,9 @@ module CreatesCommit return @merge_request if defined?(@merge_request) @merge_request = @mr_target_project.merge_requests.opened.find_by( - source_branch: @mr_source_branch, target_branch: @mr_target_branch) + source_branch: @mr_source_branch, + target_branch: @mr_target_branch + ) end def different_project? |