Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
263f005e
Commit
263f005e
authored
Jul 15, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-creating-group-with-space-in-group-path'
parents
4859770e
e367bbff
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
5 deletions
+18
-5
CHANGELOG
CHANGELOG
+1
-0
app/views/layouts/_search.html.haml
app/views/layouts/_search.html.haml
+1
-1
spec/features/groups_spec.rb
spec/features/groups_spec.rb
+16
-4
No files found.
CHANGELOG
View file @
263f005e
...
@@ -97,6 +97,7 @@ v 8.10.0 (unreleased)
...
@@ -97,6 +97,7 @@ v 8.10.0 (unreleased)
- Fix markdown rendering for: consecutive labels references, label references that begin with a digit or contains `.`
- Fix markdown rendering for: consecutive labels references, label references that begin with a digit or contains `.`
- Fix last update timestamp on issues not preserved on gitlab.com and project imports
- Fix last update timestamp on issues not preserved on gitlab.com and project imports
- Fix issues importing projects from EE to CE
- Fix issues importing projects from EE to CE
- Fix creating group with space in group path
v 8.9.6
v 8.9.6
- Fix importing of events under notes for GitLab projects. !5154
- Fix importing of events under notes for GitLab projects. !5154
...
...
app/views/layouts/_search.html.haml
View file @
263f005e
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
name
:
"
#{
j
(
@project
.
name
)
}
"
name
:
"
#{
j
(
@project
.
name
)
}
"
};
};
-
if
@group
and
@group
.
path
-
if
@group
&&
@group
.
persisted?
&&
@group
.
path
:javascript
:javascript
gl
.
groupOptions
=
gl
.
groupOptions
||
{};
gl
.
groupOptions
=
gl
.
groupOptions
||
{};
gl
.
groupOptions
[
"
#{
j
(
@group
.
path
)
}
"
]
=
{
gl
.
groupOptions
[
"
#{
j
(
@group
.
path
)
}
"
]
=
{
...
...
spec/features/groups_spec.rb
View file @
263f005e
require
'spec_helper'
require
'spec_helper'
feature
'Group'
,
feature:
true
do
feature
'Group'
,
feature:
true
do
before
do
login_as
(
:admin
)
end
describe
'creating a group with space in group path'
do
it
'renders new group form with validation errors'
do
visit
new_group_path
fill_in
'Group path'
,
with:
'space group'
click_button
'Create group'
expect
(
current_path
).
to
eq
(
groups_path
)
expect
(
page
).
to
have_content
(
"Path can contain only letters, digits, '_', '-' and '.'. Cannot start with '-' or end in '.'."
)
end
end
describe
'description'
do
describe
'description'
do
let
(
:group
)
{
create
(
:group
)
}
let
(
:group
)
{
create
(
:group
)
}
let
(
:path
)
{
group_path
(
group
)
}
let
(
:path
)
{
group_path
(
group
)
}
before
do
login_as
(
:admin
)
end
it
'parses Markdown'
do
it
'parses Markdown'
do
group
.
update_attribute
(
:description
,
'This is **my** group'
)
group
.
update_attribute
(
:description
,
'This is **my** group'
)
visit
path
visit
path
...
...
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