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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
579ae7ce
Commit
579ae7ce
authored
Aug 17, 2018
by
Tiago Botelho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes typo that prevented system header and footer settings from appearing in the admin dashboard
parent
f401f3b6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
1 deletion
+31
-1
ee/app/views/admin/appearances/_system_header_footer_form.html.haml
...ws/admin/appearances/_system_header_footer_form.html.haml
+1
-1
ee/changelogs/unreleased/7255-unable-to-see-system-header-footer-in-admin-dashboard.yml
...unable-to-see-system-header-footer-in-admin-dashboard.yml
+5
-0
spec/features/admin/admin_appearance_spec.rb
spec/features/admin/admin_appearance_spec.rb
+25
-0
No files found.
ee/app/views/admin/appearances/_system_header_footer_form.html.haml
View file @
579ae7ce
-
return
unless
License
.
feature_available?
(
:system_header_footer
_form
)
-
return
unless
License
.
feature_available?
(
:system_header_footer
)
-
form
=
local_assigns
.
fetch
(
:form
)
...
...
ee/changelogs/unreleased/7255-unable-to-see-system-header-footer-in-admin-dashboard.yml
0 → 100644
View file @
579ae7ce
---
title
:
Fixes bug that prevented a user from seeing the system header and footer settings on the admin dashboard
merge_request
:
6926
author
:
type
:
fixed
spec/features/admin/admin_appearance_spec.rb
View file @
579ae7ce
...
...
@@ -39,6 +39,31 @@ describe 'Admin Appearance' do
expect_custom_new_project_appearance
(
appearance
)
end
context
'Custom system header and footer'
do
before
do
appearance
.
update_attributes
(
header_message:
"Foo"
,
footer_message:
"Bar"
)
sign_in
(
create
(
:admin
))
end
it
'shows custom system header and footer when licensed'
do
stub_licensed_features
(
system_header_footer:
true
)
visit
admin_appearances_path
expect
(
page
).
to
have_content
appearance
.
header_message
expect
(
page
).
to
have_content
appearance
.
footer_message
end
it
'does not show custom system header and footer when unlicensed'
do
stub_licensed_features
(
system_header_footer:
false
)
visit
admin_appearances_path
expect
(
page
).
not_to
have_content
appearance
.
header_message
expect
(
page
).
not_to
have_content
appearance
.
footer_message
end
end
it
'Custom sign-in page'
do
visit
new_user_session_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