Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
4b2f08d4962c
Commit
562242cb
authored
Jul 26, 2015
by
Stan Hu
Browse files
Fix commit data retrieval when branch name has single quotes
Closes #1724
parent
265e65344694
Changes
7
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
4b2f08d4
Please view this file on the master branch, on stable branches it's out of date.
v 7.14.0 (unreleased)
- Fix commit data retrieval when branch name has single quotes (Stan Hu)
- Fix Error 500 when browsing projects with no HEAD (Stan Hu)
- Fix full screen mode for snippet comments (Daniel Gerhardt)
- Fix 404 error in files view after deleting the last file in a repository (Stan Hu)
...
...
app/controllers/projects/refs_controller.rb
View file @
4b2f08d4
class
Projects::RefsController
<
Projects
::
ApplicationController
include
ExtractsPath
include
TreeHelper
before_action
:require_non_empty_project
before_action
:assign_ref_vars
...
...
@@ -60,6 +61,11 @@ def logs_tree
}
end
if
@logs
.
present?
@log_url
=
namespace_project_tree_url
(
@project
.
namespace
,
@project
,
tree_join
(
@ref
,
@path
||
'/'
))
@more_log_url
=
logs_file_namespace_project_ref_path
(
@project
.
namespace
,
@project
,
@ref
,
@path
||
''
,
offset:
(
@offset
+
@limit
))
end
respond_to
do
|
format
|
format
.
html
{
render_404
}
format
.
js
...
...
app/views/projects/refs/logs_tree.js.haml
View file @
4b2f08d4
...
...
@@ -11,9 +11,11 @@
-
if
@logs
.
present?
:plain
var current_url = location.href.replace(/\/?$/, '/');
var log_url = '
#{
namespace_project_tree_url
(
@project
.
namespace
,
@project
,
tree_join
(
@ref
,
@path
||
'/'
))
}
'.replace(/\/?$/, '/');
var log_url = "
#{
escape_javascript
(
@log_url
)
}
".replace(/\/?$/, '/');
if(current_url == log_url) {
// Load
10
more commit log for each file in tree
// Load more commit log
s
for each file in tree
// if we still on the same page
ajaxGet('
#{
logs_file_namespace_project_ref_path
(
@project
.
namespace
,
@project
,
@ref
,
@path
||
''
,
offset:
(
@offset
+
@limit
))
}
');
var url = "
#{
escape_javascript
(
@more_log_url
)
}
";
ajaxGet(url);
}
app/views/projects/tree/_tree.html.haml
View file @
4b2f08d4
...
...
@@ -49,5 +49,5 @@
:javascript
// Load last commit log for each file in tree
$
(
'
#tree-slider
'
).
waitForImages
(
function
()
{
ajaxGet
(
'
#{
@logs_path
}
'
);
ajaxGet
(
"
#{
escape_javascript
(
@logs_path
)
}
"
);
});
features/project/source/browse_files.feature
View file @
4b2f08d4
...
...
@@ -158,3 +158,10 @@ Feature: Project Source Browse Files
Given
I visit project source page for
"6d394385cf567f80a8fd85055db1ab4c5295806f"
And
I click on
".gitignore"
file in repo
Then
I don't see the permalink link
@javascript
Scenario
:
I
browse code with single quotes in the ref
Given
I switch ref to 'test'
And
I see the ref 'test' has been selected
And
I visit the 'test' tree
Then
I see the commit data
features/steps/project/source/browse_files.rb
View file @
4b2f08d4
...
...
@@ -193,6 +193,23 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
FileUtils
.
rm_f
(
File
.
join
(
@project
.
repository
.
path
,
'hooks'
,
'pre-receive'
))
end
step
"I switch ref to 'test'"
do
select
"'test'"
,
from:
'ref'
end
step
"I see the ref 'test' has been selected"
do
expect
(
page
).
to
have_selector
'.select2-chosen'
,
text:
"'test'"
end
step
"I visit the 'test' tree"
do
visit
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
"'test'"
)
end
step
'I see the commit data'
do
expect
(
page
).
to
have_css
(
'.tree-commit-link'
,
visible:
true
)
expect
(
page
).
not_to
have_content
(
'Loading commit data...'
)
end
private
def
set_new_content
...
...
spec/support/test_env.rb
View file @
4b2f08d4
...
...
@@ -12,7 +12,8 @@ module TestEnv
'fix'
=>
'12d65c8'
,
'improve/awesome'
=>
'5937ac0'
,
'markdown'
=>
'0ed8c6c'
,
'master'
=>
'5937ac0'
'master'
=>
'5937ac0'
,
"'test'"
=>
'e56497b'
,
}
# gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily
...
...
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