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
3e6cbcdd
Commit
3e6cbcdd
authored
Feb 19, 2016
by
Kamil Trzcinski
Committed by
James Edwards-Jones
Jan 31, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pages abilities
parent
492627c9
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
9 deletions
+18
-9
app/controllers/projects/pages_controller.rb
app/controllers/projects/pages_controller.rb
+2
-1
app/policies/project_policy.rb
app/policies/project_policy.rb
+2
-0
app/views/projects/pages/_destroy.haml
app/views/projects/pages/_destroy.haml
+2
-0
app/views/projects/pages/_list.html.haml
app/views/projects/pages/_list.html.haml
+1
-1
app/views/projects/pages/_no_domains.html.haml
app/views/projects/pages/_no_domains.html.haml
+7
-6
app/views/projects/pages/show.html.haml
app/views/projects/pages/show.html.haml
+1
-1
doc/user/permissions.md
doc/user/permissions.md
+3
-0
No files found.
app/controllers/projects/pages_controller.rb
View file @
3e6cbcdd
class
Projects::PagesController
<
Projects
::
ApplicationController
class
Projects::PagesController
<
Projects
::
ApplicationController
layout
'project_settings'
layout
'project_settings'
before_action
:authorize_update_pages!
before_action
:authorize_read_pages!
,
only:
[
:show
]
before_action
:authorize_update_pages!
,
except:
[
:show
]
def
show
def
show
@domains
=
@project
.
pages_domains
.
order
(
:domain
)
@domains
=
@project
.
pages_domains
.
order
(
:domain
)
...
...
app/policies/project_policy.rb
View file @
3e6cbcdd
...
@@ -110,6 +110,8 @@ class ProjectPolicy < BasePolicy
...
@@ -110,6 +110,8 @@ class ProjectPolicy < BasePolicy
can!
:admin_pipeline
can!
:admin_pipeline
can!
:admin_environment
can!
:admin_environment
can!
:admin_deployment
can!
:admin_deployment
can!
:admin_pages
can!
:read_pages
can!
:update_pages
can!
:update_pages
end
end
...
...
app/views/projects/pages/_destroy.haml
View file @
3e6cbcdd
...
@@ -7,3 +7,5 @@
...
@@ -7,3 +7,5 @@
Removing the pages will prevent from exposing them to outside world.
Removing the pages will prevent from exposing them to outside world.
.form-actions
.form-actions
=
link_to
'Remove pages'
,
namespace_project_pages_path
(
@project
.
namespace
,
@project
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-remove"
=
link_to
'Remove pages'
,
namespace_project_pages_path
(
@project
.
namespace
,
@project
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-remove"
-
else
.nothing-here-block
Only the project owner can remove pages
app/views/projects/pages/_list.html.haml
View file @
3e6cbcdd
-
if
@domains
.
any?
-
if
can?
(
current_user
,
:update_pages
,
@project
)
&&
@domains
.
any?
.panel.panel-default
.panel.panel-default
.panel-heading
.panel-heading
Domains (
#{
@domains
.
count
}
)
Domains (
#{
@domains
.
count
}
)
...
...
app/views/projects/pages/_no_domains.html.haml
View file @
3e6cbcdd
.panel.panel-default
-
if
can?
(
current_user
,
:update_pages
,
@project
)
.panel-heading
.panel.panel-default
Domains
.panel-heading
.nothing-here-block
Domains
Support for domains and certificates is disabled.
.nothing-here-block
Ask your system's administrator to enable it.
Support for domains and certificates is disabled.
Ask your system's administrator to enable it.
app/views/projects/pages/show.html.haml
View file @
3e6cbcdd
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
%h3
.page_title
%h3
.page_title
Pages
Pages
-
if
Gitlab
.
config
.
pages
.
external_http
||
Gitlab
.
config
.
pages
.
external_https
-
if
can?
(
current_user
,
:update_pages
,
@project
)
&&
(
Gitlab
.
config
.
pages
.
external_http
||
Gitlab
.
config
.
pages
.
external_https
)
=
link_to
new_namespace_project_pages_domain_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-new pull-right'
,
title:
'New Domain'
do
=
link_to
new_namespace_project_pages_domain_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-new pull-right'
,
title:
'New Domain'
do
%i
.fa.fa-plus
%i
.fa.fa-plus
New Domain
New Domain
...
...
doc/user/permissions.md
View file @
3e6cbcdd
...
@@ -62,11 +62,14 @@ The following table depicts the various user permission levels in a project.
...
@@ -62,11 +62,14 @@ The following table depicts the various user permission levels in a project.
| Manage runners | | | | ✓ | ✓ |
| Manage runners | | | | ✓ | ✓ |
| Manage build triggers | | | | ✓ | ✓ |
| Manage build triggers | | | | ✓ | ✓ |
| Manage variables | | | | ✓ | ✓ |
| Manage variables | | | | ✓ | ✓ |
| Manage pages | | | | ✓ | ✓ |
| Manage pages domains and certificates | | | | ✓ | ✓ |
| Switch visibility level | | | | | ✓ |
| Switch visibility level | | | | | ✓ |
| Transfer project to another namespace | | | | | ✓ |
| Transfer project to another namespace | | | | | ✓ |
| Remove project | | | | | ✓ |
| Remove project | | | | | ✓ |
| Force push to protected branches [^3] | | | | | |
| Force push to protected branches [^3] | | | | | |
| Remove protected branches [^3] | | | | | |
| Remove protected branches [^3] | | | | | |
| Remove pages | | | | | ✓ |
## Group
## Group
...
...
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