BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
2d980cb7
Commit
2d980cb7
authored
Nov 20, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix commits list 500 with multi-file editor new_repo cookie
Fix
https://gitlab.com/gitlab-org/gitlab-ce/issues/39821
/<namespace>/<project>/commmits/master
parent
d41e66cb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
0 deletions
+14
-0
_ref_switcher.html.haml
app/views/shared/_ref_switcher.html.haml
+2
-0
39821-fix-commits-list-with-multi-file-editor.yml
...eleased/39821-fix-commits-list-with-multi-file-editor.yml
+5
-0
commits_spec.rb
spec/features/commits_spec.rb
+7
-0
No files found.
app/views/shared/_ref_switcher.html.haml
View file @
2d980cb7
-
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
...
...
changelogs/unreleased/39821-fix-commits-list-with-multi-file-editor.yml
0 → 100644
View file @
2d980cb7
---
title
:
Fix commits page throwing 500 when the multi-file editor was enabled
merge_request
:
15502
author
:
type
:
fixed
spec/features/commits_spec.rb
View file @
2d980cb7
...
...
@@ -202,5 +202,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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment