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
a7bd0d9c
Commit
a7bd0d9c
authored
Apr 06, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add help page link and standardize "Service Desk"
parent
088e2765
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.js
.../settings_service_desk/components/service_desk_setting.js
+1
-1
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+1
-1
spec/features/projects/settings/ee/service_desk_setting_spec.rb
...eatures/projects/settings/ee/service_desk_setting_spec.rb
+1
-1
spec/javascripts/projects/settings_service_desk/services/service_desk_service_spec.js
...ttings_service_desk/services/service_desk_service_spec.js
+4
-4
No files found.
app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.js
View file @
a7bd0d9c
...
...
@@ -37,7 +37,7 @@ export default {
:checked="isEnabled"
@change="onCheckboxToggle($event)">
<span class="descr">
Activate
service d
esk
Activate
Service D
esk
</span>
</label>
</div>
...
...
app/views/projects/edit.html.haml
View file @
a7bd0d9c
...
...
@@ -131,7 +131,7 @@
%fieldset
.js-service-desk-setting-wrapper.features.append-bottom-default
%h5
.prepend-top-0
Service Desk
=
link_to
icon
(
'question-circle'
),
help_page_path
(
"TODO"
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'user/project/service_desk'
)
.js-service-desk-setting-root
{
data:
{
endpoint:
namespace_project_service_desk_path
(
@project
.
namespace
,
@project
),
enabled:
@project
.
service_desk_enabled
,
incoming_email:
(
@project
.
service_desk_address
if
@project
.
service_desk_enabled
)
}
}
...
...
spec/features/projects/settings/ee/service_desk_setting_spec.rb
View file @
a7bd0d9c
...
...
@@ -15,7 +15,7 @@ describe 'Service Desk Setting', js: true, feature: true do
visit
edit_namespace_project_path
(
project
.
namespace
,
project
)
end
it
'shows
service d
esk activation checkbox'
do
it
'shows
Service D
esk activation checkbox'
do
expect
(
page
).
to
have_selector
(
"#service-desk-enabled-checkbox"
)
end
...
...
spec/javascripts/projects/settings_service_desk/services/service_desk_service_spec.js
View file @
a7bd0d9c
...
...
@@ -26,7 +26,7 @@ describe('ServiceDeskService', () => {
});
describe
(
'
toggleServiceDesk
'
,
()
=>
{
it
(
'
enable
service d
esk
'
,
(
done
)
=>
{
it
(
'
enable
Service D
esk
'
,
(
done
)
=>
{
spyOn
(
service
.
serviceDeskResource
,
'
update
'
).
and
.
returnValue
(
Promise
.
resolve
({
data
:
{
service_desk_enabled
:
true
,
...
...
@@ -40,11 +40,11 @@ describe('ServiceDeskService', () => {
done
();
})
.
catch
((
err
)
=>
{
done
.
fail
(
`Failed to enable
service d
esk and fetch incoming email:\n
${
err
}
`
);
done
.
fail
(
`Failed to enable
Service D
esk and fetch incoming email:\n
${
err
}
`
);
});
});
it
(
'
disable
service d
esk
'
,
(
done
)
=>
{
it
(
'
disable
Service D
esk
'
,
(
done
)
=>
{
spyOn
(
service
.
serviceDeskResource
,
'
update
'
).
and
.
returnValue
(
Promise
.
resolve
({
data
:
{
service_desk_enabled
:
false
,
...
...
@@ -58,7 +58,7 @@ describe('ServiceDeskService', () => {
done
();
})
.
catch
((
err
)
=>
{
done
.
fail
(
`Failed to disable
service d
esk and reset incoming email:\n
${
err
}
`
);
done
.
fail
(
`Failed to disable
Service D
esk and reset incoming email:\n
${
err
}
`
);
});
});
});
...
...
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