diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /lib/api/repositories.rb | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'lib/api/repositories.rb')
-rw-r--r-- | lib/api/repositories.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb index 033cc6744b0..a5234828de3 100644 --- a/lib/api/repositories.rb +++ b/lib/api/repositories.rb @@ -37,7 +37,7 @@ module API begin @blob = Gitlab::Git::Blob.raw(@repo, params[:sha]) @blob.load_all_data!(@repo) - rescue + rescue StandardError not_found! 'Blob' end @@ -106,7 +106,7 @@ module API not_acceptable! if Gitlab::HotlinkingDetector.intercept_hotlinking?(request) send_git_archive user_project.repository, ref: params[:sha], format: params[:format], append_sha: true - rescue + rescue StandardError not_found!('File') end @@ -152,7 +152,7 @@ module API get ':id/repository/contributors' do contributors = ::Kaminari.paginate_array(user_project.repository.contributors(order_by: params[:order_by], sort: params[:sort])) present paginate(contributors), with: Entities::Contributor - rescue + rescue StandardError not_found! end @@ -224,7 +224,7 @@ module API desc: 'The commit message to use when committing the changelog' end post ':id/repository/changelog' do - branch = params[:branch] || user_project.default_branch_or_master + branch = params[:branch] || user_project.default_branch_or_main access = Gitlab::UserAccess.new(current_user, container: user_project) unless access.can_push_to_branch?(branch) |