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
db503e7d
Commit
db503e7d
authored
Aug 18, 2020
by
Eulyeon Ko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use appropriate link helpers
Use page_path helpers and remove usage of expose_url.
parent
6c3cd5fa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
app/helpers/projects/issues/service_desk_helper.rb
app/helpers/projects/issues/service_desk_helper.rb
+3
-3
spec/helpers/projects/issues/service_desk_helper_spec.rb
spec/helpers/projects/issues/service_desk_helper_spec.rb
+3
-3
No files found.
app/helpers/projects/issues/service_desk_helper.rb
View file @
db503e7d
...
...
@@ -20,15 +20,15 @@ module Projects::Issues::ServiceDeskHelper
def
supported_meta
(
project
)
{
service_desk_address:
project
.
service_desk_address
,
service_desk_help_page:
expose_url
(
'help/
user/project/service_desk'
),
edit_project_page:
e
xpose_url
(
edit_project_path
(
project
)
),
service_desk_help_page:
help_page_path
(
'
user/project/service_desk'
),
edit_project_page:
e
dit_project_path
(
project
),
svg_path:
image_path
(
'illustrations/service_desk_empty.svg'
)
}
end
def
unsupported_meta
(
project
)
{
incoming_email_help_page:
"
#{
expose_url
(
'/help/administration/incoming_email'
)
}
\#
set-it-up"
,
incoming_email_help_page:
help_page_path
(
'administration/incoming_email'
,
anchor:
'set-it-up'
)
,
svg_path:
image_path
(
'illustrations/service-desk-setup.svg'
)
}
end
...
...
spec/helpers/projects/issues/service_desk_helper_spec.rb
View file @
db503e7d
...
...
@@ -24,8 +24,8 @@ RSpec.describe Projects::Issues::ServiceDeskHelper do
is_service_desk_enabled:
true
,
can_edit_project_settings:
true
,
service_desk_address:
project
.
service_desk_address
,
service_desk_help_page:
expose_url
(
'help/
user/project/service_desk'
),
edit_project_page:
e
xpose_url
(
edit_project_path
(
project
)
),
service_desk_help_page:
help_page_path
(
'
user/project/service_desk'
),
edit_project_page:
e
dit_project_path
(
project
),
svg_path:
ActionController
::
Base
.
helpers
.
image_path
(
'illustrations/service_desk_empty.svg'
)
})
}
...
...
@@ -44,7 +44,7 @@ RSpec.describe Projects::Issues::ServiceDeskHelper do
is_service_desk_supported:
false
,
is_service_desk_enabled:
false
,
can_edit_project_settings:
false
,
incoming_email_help_page:
"
#{
expose_url
(
'/help/administration/incoming_email'
)
}
\#
set-it-up"
,
incoming_email_help_page:
help_page_path
(
'administration/incoming_email'
,
anchor:
'set-it-up'
)
,
svg_path:
ActionController
::
Base
.
helpers
.
image_path
(
'illustrations/service-desk-setup.svg'
)
})
}
...
...
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