diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-25 04:16:45 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-25 04:16:45 +0000 |
| commit | 8f3f6e9efbbacf5e52f98324944f644630da2f18 (patch) | |
| tree | b8bd189a7dc4919a832eb583441d398b7294cb8c /lib/api/merge_requests.rb | |
| parent | d7aecf68e02cb9ac3b7e022aca60e15a65a62ac6 (diff) | |
| parent | 4745424bd3b7f6e13e86ebf985977ad3268881e3 (diff) | |
| download | gitlab-ce-8f3f6e9efbbacf5e52f98324944f644630da2f18.tar.gz | |
Merge branch 'api-internal-errors' into 'master'
Respond with full GitAccess error if user has project read access.
Should help with debugging #1236.
cc @marin
See merge request !437
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 25b7857f4b1..f3765f5ab03 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -178,7 +178,8 @@ module API put ":id/merge_request/:merge_request_id/merge" do merge_request = user_project.merge_requests.find(params[:merge_request_id]) - allowed = ::Gitlab::GitAccess.can_push_to_branch?(current_user, user_project, merge_request.target_branch) + allowed = ::Gitlab::GitAccess.new(current_user, user_project). + can_push_to_branch?(merge_request.target_branch) if allowed if merge_request.unchecked? |