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
334347fe
Commit
334347fe
authored
Nov 21, 2016
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Frontend review changes
parent
67fde388
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
90 additions
and
84 deletions
+90
-84
app/assets/stylesheets/framework/forms.scss
app/assets/stylesheets/framework/forms.scss
+29
-28
app/assets/stylesheets/pages/settings.scss
app/assets/stylesheets/pages/settings.scss
+4
-0
app/views/projects/services/mattermost_slash_commands/_help.html.haml
...ojects/services/mattermost_slash_commands/_help.html.haml
+18
-18
app/views/shared/_service_settings.html.haml
app/views/shared/_service_settings.html.haml
+39
-38
No files found.
app/assets/stylesheets/framework/forms.scss
View file @
334347fe
...
...
@@ -68,8 +68,10 @@ label {
}
}
.help-form
{
.form-group
{
.help-form
.form-group
{
margin-left
:
0
;
margin-right
:
0
;
.control-label
{
font-weight
:
bold
;
padding-top
:
4px
;
...
...
@@ -104,7 +106,6 @@ label {
padding-left
:
0
;
}
}
}
}
.fieldset-form
fieldset
{
...
...
app/assets/stylesheets/pages/settings.scss
View file @
334347fe
...
...
@@ -20,3 +20,7 @@
.danger-title
{
color
:
$gl-danger
;
}
.service-settings
.control-label
{
padding-top
:
0
;
}
app/views/projects/services/mattermost_slash_commands/_help.html.haml
View file @
334347fe
...
...
@@ -2,14 +2,14 @@
-
run_actions_text
=
"Perform common operations on this project:
#{
pretty_path_with_namespace
}
"
.well
%p
This service allows GitLab users to perform common operations on this
project by entering slash commands in Mattermost.
%
p
%
br
See list of available commands in Mattermost after setting up this service,
by entering
%code
/
<
command_trigger_word
>
help
%p
%br
%br
To setup this service:
%ul
.list-unstyled
%li
...
...
app/views/shared/_service_settings.html.haml
View file @
334347fe
...
...
@@ -7,12 +7,13 @@
=
preserve
do
=
markdown
@service
.
help
.form-group
.service-settings
.form-group
=
form
.
label
:active
,
"Active"
,
class:
"control-label"
.col-sm-10
=
form
.
check_box
:active
-
if
@service
.
supported_events
.
present?
-
if
@service
.
supported_events
.
present?
.form-group
=
form
.
label
:url
,
"Trigger"
,
class:
'control-label'
...
...
@@ -34,7 +35,7 @@
%p
.light
=
service_event_description
(
event
)
-
@service
.
global_fields
.
each
do
|
field
|
-
@service
.
global_fields
.
each
do
|
field
|
-
type
=
field
[
:type
]
-
if
type
==
'fieldset'
...
...
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