diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-23 14:38:23 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-23 14:38:23 +0200 |
| commit | 28e13634dc9318dbd093a4561ee8ea16e1d71460 (patch) | |
| tree | 0a14694c45a8328fc9dbf868f310c5ba3a71184f /lib/api/merge_requests.rb | |
| parent | 68590fddd860c5d840d8f04314ed11f0d02ddd44 (diff) | |
| parent | 573f1f4ade80cc3b66723ad12594467e881b4510 (diff) | |
| download | gitlab-ce-28e13634dc9318dbd093a4561ee8ea16e1d71460.tar.gz | |
Merge branch 'improve/mr_diff'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
features/steps/project/project_fork.rb
features/steps/project/project_forked_merge_requests.rb
features/steps/project/project_issue_tracker.rb
features/steps/project/project_markdown_render.rb
features/steps/shared/project.rb
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index cbaf22f265d..0f62cac9a0c 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -88,7 +88,6 @@ module API end if merge_request.save - merge_request.reload_code present merge_request, with: Entities::MergeRequest else handle_merge_request_errors! merge_request.errors |