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
ddc8326a35dd
Commit
aa97ff7f
authored
Jan 09, 2013
by
Dmitriy Zaporozhets
Browse files
Fixed tree logs for branches with slash. Fixed remember of path when switch branch
parent
5d6f38b4ccd7
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/controllers/refs_controller.rb
View file @
ddc8326a
...
...
@@ -12,7 +12,7 @@ def switch
respond_to
do
|
format
|
format
.
html
do
new_path
=
if
params
[
:destination
]
==
"tree"
project_tree_path
(
@project
,
@ref
)
project_tree_path
(
@project
,
(
@ref
+
"/"
+
params
[
:path
])
)
else
project_commits_path
(
@project
,
@ref
)
end
...
...
config/routes.rb
View file @
ddc8326a
...
...
@@ -158,7 +158,7 @@
resources
:deploy_keys
resources
:protected_branches
,
only:
[
:index
,
:create
,
:destroy
]
resources
:refs
,
only:
[]
,
path:
"/"
do
resources
:refs
,
only:
[]
do
collection
do
get
"switch"
end
...
...
lib/extracts_path.rb
View file @
ddc8326a
...
...
@@ -52,7 +52,7 @@ def extract_ref(input)
# Remove project, actions and all other staff from path
input
.
gsub!
(
/^\/
#{
Regexp
.
escape
(
@project
.
path_with_namespace
)
}
/
,
""
)
input
.
gsub!
(
/^\/(tree|commits|blame|blob)\//
,
""
)
# remove actions
input
.
gsub!
(
/^\/(tree|commits|blame|blob
|refs
)\//
,
""
)
# remove actions
input
.
gsub!
(
/\?.*$/
,
""
)
# remove stamps suffix
input
.
gsub!
(
/.atom$/
,
""
)
# remove rss feed
input
.
gsub!
(
/\/edit$/
,
""
)
# remove edit route part
...
...
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