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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
9d774459
Commit
9d774459
authored
Dec 19, 2016
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zj frontend review
parent
8df4a412
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
app/views/projects/mattermost/new.html.haml
app/views/projects/mattermost/new.html.haml
+2
-3
app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml
...es/mattermost_slash_commands/_installation_info.html.haml
+1
-1
No files found.
app/views/projects/mattermost/new.html.haml
View file @
9d774459
...
@@ -24,10 +24,9 @@
...
@@ -24,10 +24,9 @@
%h4
Team
%h4
Team
%p
Select or create the team where the slash commands will be used in
%p
Select or create the team where the slash commands will be used in
-
options
=
mattermost_teams_options
(
@teams
)
-
options
=
mattermost_teams_options
(
@teams
)
-
isOneTeam
=
options
.
count
===
1
=
f
.
select
(
:team_id
,
options
,
{},
{
class:
'form-control'
,
selected:
"
#{
options
.
first
[
1
]
if
options
.
count
.
one?
}
"
,
disabled:
options
.
count
.
one?
})
=
f
.
select
(
:team_id
,
options
,
{},
{
class:
'form-control'
,
selected:
"
#{
options
.
first
[
1
]
if
isOneTeam
}
"
,
disabled:
isOneTeam
})
.help-block
.help-block
-
if
isOneTeam
-
if
options
.
count
.
one?
This is the only team where you are an administrator.
This is the only team where you are an administrator.
-
else
-
else
The list shows teams where you are administrator
The list shows teams where you are administrator
...
...
app/views/projects/services/mattermost_slash_commands/_installation_info.html.haml
View file @
9d774459
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
.col-sm-9
=
@service
.
activated?
?
'Installed'
:
'Not installed'
.col-sm-9
=
@service
.
activated?
?
'Installed'
:
'Not installed'
.row
.row
%strong
.col-sm-3.text-right
Mattermost
%strong
.col-sm-3.text-right
Mattermost
=
link_to
Gitlab
.
config
.
mattermost
.
host
,
Gitlab
.
config
.
mattermost
.
host
,
class:
'col-sm-9'
,
target:
'__blank'
=
link_to
Gitlab
.
config
.
mattermost
.
host
.
gsub
(
/\A.*?:\/\//
,
''
)
,
Gitlab
.
config
.
mattermost
.
host
,
class:
'col-sm-9'
,
target:
'__blank'
.row
.row
%strong
.col-sm-3.text-right
Installation
%strong
.col-sm-3.text-right
Installation
.col-sm-9
.col-sm-9
...
...
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