Merge branch '39821-fix-commits-list-with-multi-file-editor' into 'master'
Fix commits list 500 with multi-file editor new_repo cookie Closes #39821 See merge request gitlab-org/gitlab-ce!15502
This commit is contained in:
commit
5ce2f847b1
|
@ -1,3 +1,5 @@
|
|||
- show_create = local_assigns.fetch(:show_create, false)
|
||||
|
||||
- show_new_branch_form = show_new_repo? && show_create && can?(current_user, :push_code, @project)
|
||||
- dropdown_toggle_text = @ref || @project.default_branch
|
||||
= form_tag switch_project_refs_path(@project), method: :get, class: "project-refs-form" do
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix commits page throwing 500 when the multi-file editor was enabled
|
||||
merge_request: 15502
|
||||
author:
|
||||
type: fixed
|
|
@ -200,5 +200,12 @@ describe 'Commits' do
|
|||
expect(page).to have_content("committed #{commit.committed_date.strftime("%b %d, %Y")}")
|
||||
end
|
||||
end
|
||||
|
||||
it 'shows the ref switcher with the multi-file editor enabled', :js do
|
||||
set_cookie('new_repo', 'true')
|
||||
visit project_commits_path(project, branch_name)
|
||||
|
||||
expect(find('.js-project-refs-dropdown')).to have_content branch_name
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue