diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-23 10:44:10 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-23 10:44:10 +0100 |
| commit | 6fb7fb5c1a44926511914080334774b21a5ee9af (patch) | |
| tree | 4fdf8530c98576fd19c306a3c74540998bee9fd0 /app/services/merge_requests/conflicts/resolve_service.rb | |
| parent | 3b53b553b78d20268d228afa596b53d18046f98e (diff) | |
| parent | 801cf92310e9f6950dddba848ef1e6a3d1e48ef0 (diff) | |
| download | gitlab-ce-6fb7fb5c1a44926511914080334774b21a5ee9af.tar.gz | |
Merge branch 'master' into experimental-top-nav
Diffstat (limited to 'app/services/merge_requests/conflicts/resolve_service.rb')
| -rw-r--r-- | app/services/merge_requests/conflicts/resolve_service.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/services/merge_requests/conflicts/resolve_service.rb b/app/services/merge_requests/conflicts/resolve_service.rb index c2c335b8461..6b6e231f4f9 100644 --- a/app/services/merge_requests/conflicts/resolve_service.rb +++ b/app/services/merge_requests/conflicts/resolve_service.rb @@ -27,10 +27,10 @@ module MergeRequests tree: merge_index.write_tree(rugged) } - conflicts_for_resolution. - project. - repository. - resolve_conflicts(current_user, merge_request.source_branch, commit_params) + conflicts_for_resolution + .project + .repository + .resolve_conflicts(current_user, merge_request.source_branch, commit_params) end end |