diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-29 23:58:28 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-29 23:58:28 +0000 |
commit | 6cf208f33ad87d199cb9b50fd0b29cf243155f90 (patch) | |
tree | b147a9f37a90d9b8c2057e938f8fb1596c51bb55 /app/controllers/projects_controller.rb | |
parent | dd45a03c04b9cc91cd761bf2e94644ee92f2a8f6 (diff) | |
download | gitlab-ce-6cf208f33ad87d199cb9b50fd0b29cf243155f90.tar.gz |
Add latest changes from gitlab-org/security/gitlab@15-10-stable-ee
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r-- | app/controllers/projects_controller.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index c12caecdc23..f18055f80b7 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -173,19 +173,11 @@ class ProjectsController < Projects::ApplicationController flash.now[:alert] = _("Project '%{project_name}' queued for deletion.") % { project_name: @project.name } end - if ambiguous_ref?(@project, @ref) - branch = @project.repository.find_branch(@ref) - - # The files view would render a ref other than the default branch - # This redirect can be removed once the view is fixed - redirect_to(project_tree_path(@project, branch.target), alert: _("The default branch of this project clashes with another ref")) - return - end - respond_to do |format| format.html do @notification_setting = current_user.notification_settings_for(@project) if current_user @project = @project.present(current_user: current_user) + render_landing_page end |