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
0381dae6
Commit
0381dae6
authored
Sep 05, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix up static analysis issues.
parent
bf122d94
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
app/assets/stylesheets/application.scss
app/assets/stylesheets/application.scss
+2
-1
ee/app/views/projects/issues/_service_desk_info_content.html.haml
...iews/projects/issues/_service_desk_info_content.html.haml
+1
-1
ee/app/views/projects/issues/service_desk.html.haml
ee/app/views/projects/issues/service_desk.html.haml
+1
-1
spec/ee/spec/features/issues/service_desk_spec.rb
spec/ee/spec/features/issues/service_desk_spec.rb
+1
-1
No files found.
app/assets/stylesheets/application.scss
View file @
0381dae6
...
...
@@ -47,4 +47,5 @@
/*
* EE-only stylesheets
*/
@import
"../../../ee/app/assets/stylesheets/**/*"
;
\ No newline at end of file
@import
"../../../ee/app/assets/stylesheets/**/*"
;
ee/app/views/projects/issues/_service_desk_info_content.html.haml
View file @
0381dae6
...
...
@@ -20,5 +20,5 @@
=
link_to
'Read more'
,
help_page_path
(
'user/project/service_desk'
)
-
if
!
service_desk_enabled
%div
.turn-on-btn-container
.turn-on-btn-container
=
link_to
"Turn on Service Desk"
,
edit_project_path
(
@project
),
class:
'btn btn-new btn-inverted'
ee/app/views/projects/issues/service_desk.html.haml
View file @
0381dae6
...
...
@@ -16,7 +16,7 @@
-
support_bot_attrs
=
User
.
support_bot
.
to_json
(
only:
[
:id
,
:name
,
:username
,
:avatar_url
])
%div
{
class:
"#{container_class} service-desk-issues"
,
data:
{
support_bot:
support_bot_attrs
}}
%div
{
class:
"#{container_class} service-desk-issues"
,
data:
{
support_bot:
support_bot_attrs
}
}
.top-area
=
render
'shared/issuable/nav'
,
type: :issues
.nav-controls
{
class:
(
"visible-xs"
if
show_new_nav?
)
}
...
...
spec/ee/spec/features/issues/service_desk_spec.rb
View file @
0381dae6
require
'spec_helper'
describe
'Service Desk Issue Tracker'
,
focus:
true
do
describe
'Service Desk Issue Tracker'
do
let
(
:project
)
{
create
(
:project
,
:private
,
service_desk_enabled:
true
)
}
let
(
:user
)
{
create
(
:user
)
}
...
...
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