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
639cf728
Commit
639cf728
authored
Feb 23, 2016
by
Kamil Trzcinski
Committed by
James Edwards-Jones
Jan 31, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix adding pages domain to projects in groups
parent
5556db04
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
app/views/projects/pages_domains/_form.html.haml
app/views/projects/pages_domains/_form.html.haml
+1
-1
features/project/pages.feature
features/project/pages.feature
+9
-0
features/steps/shared/project.rb
features/steps/shared/project.rb
+6
-0
No files found.
app/views/projects/pages_domains/_form.html.haml
View file @
639cf728
=
form_for
[
@project
.
namespace
,
@project
,
@domain
],
html:
{
class:
'form-horizontal fieldset-form'
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
)
,
@project
,
@domain
],
html:
{
class:
'form-horizontal fieldset-form'
}
do
|
f
|
-
if
@domain
.
errors
.
any?
#error_explanation
.alert.alert-danger
...
...
features/project/pages.feature
View file @
639cf728
...
...
@@ -40,6 +40,15 @@ Feature: Project Pages
And
I click on
"Create New Domain"
Then
I should see a new domain added
Scenario
:
I
should be able to add a new domain for project in group namespace
Given
I own a project in some group namespace
And
pages are enabled
And
pages are exposed on external HTTP address
When
I visit add a new Pages Domain
And
I fill the domain
And
I click on
"Create New Domain"
Then
I should see a new domain added
Scenario
:
I
should be denied to add the same domain twice
Given
pages are enabled
And
pages are exposed on external HTTP address
...
...
features/steps/shared/project.rb
View file @
639cf728
...
...
@@ -7,6 +7,12 @@ module SharedProject
@project
.
team
<<
[
@user
,
:master
]
end
step
"I own a project in some group namespace"
do
@group
=
create
(
:group
,
name:
'some group'
)
@project
=
create
(
:project
,
namespace:
@group
)
@project
.
team
<<
[
@user
,
:master
]
end
step
"project exists in some group namespace"
do
@group
=
create
(
:group
,
name:
'some group'
)
@project
=
create
(
:project
,
:repository
,
namespace:
@group
,
public_builds:
false
)
...
...
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