summaryrefslogtreecommitdiff
path: root/app/services/merge_requests
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-10-15 23:19:34 -0700
committerStan Hu <stanhu@gmail.com>2015-10-15 23:54:13 -0700
commitbf290a52b7589ccd0e37a224ec36cec28acfb6a8 (patch)
tree9facd5e26ee2f76c68079600efb9da5ba6dd337e /app/services/merge_requests
parent577565d939d60cd48ce9e8aebc44663076af5aa2 (diff)
downloadgitlab-ce-bf290a52b7589ccd0e37a224ec36cec28acfb6a8.tar.gz
Rubocop fix
Diffstat (limited to 'app/services/merge_requests')
-rw-r--r--app/services/merge_requests/refresh_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb
index 7c4cb35ec6b..c378f14c265 100644
--- a/app/services/merge_requests/refresh_service.rb
+++ b/app/services/merge_requests/refresh_service.rb
@@ -94,7 +94,7 @@ module MergeRequests
# gitlab_git throws a Rugged::OdbError
# This is fixed in https://gitlab.com/gitlab-org/gitlab_git/merge_requests/52
@commits = @project.repository.commits_between(common_ref, @newrev) if common_ref
- rescue => e
+ rescue
end
# Prevent system notes from seeing a blank SHA