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
5eba9b88
Commit
5eba9b88
authored
Jul 07, 2017
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Slack application] Show Slack button when there is team added
parent
bf495f36
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
app/views/projects/services/gitlab_slack_application/_help.html.haml
...rojects/services/gitlab_slack_application/_help.html.haml
+0
-1
app/views/projects/services/gitlab_slack_application/_slack_integration_form.html.haml
...itlab_slack_application/_slack_integration_form.html.haml
+3
-1
No files found.
app/views/projects/services/gitlab_slack_application/_help.html.haml
View file @
5eba9b88
...
@@ -13,5 +13,4 @@
...
@@ -13,5 +13,4 @@
by entering
by entering
%kbd
.inline
/gitlab help
%kbd
.inline
/gitlab help
-
unless
@service
.
template?
-
unless
@service
.
template?
%p
To set up this service press "Add to Slack"
=
render
"projects/services/
#{
@service
.
to_param
}
/slack_integration_form"
=
render
"projects/services/
#{
@service
.
to_param
}
/slack_integration_form"
app/views/projects/services/gitlab_slack_application/_slack_integration_form.html.haml
View file @
5eba9b88
=
render
"projects/services/
#{
@service
.
to_param
}
/slack_button"
-
slack_integration
=
@service
.
slack_integration
-
slack_integration
=
@service
.
slack_integration
-
if
slack_integration
-
if
slack_integration
%table
.table
%table
.table
...
@@ -26,3 +25,6 @@
...
@@ -26,3 +25,6 @@
-
project
=
@service
.
project
-
project
=
@service
.
project
=
link_to
'Edit'
,
edit_project_settings_slack_path
(
project
),
class:
'btn btn-sm'
=
link_to
'Edit'
,
edit_project_settings_slack_path
(
project
),
class:
'btn btn-sm'
=
link_to
'Remove'
,
project_settings_slack_path
(
project
),
method: :delete
,
class:
'btn btn-danger btn-sm'
,
data:
{
confirm:
'Are you sure?'
}
=
link_to
'Remove'
,
project_settings_slack_path
(
project
),
method: :delete
,
class:
'btn btn-danger btn-sm'
,
data:
{
confirm:
'Are you sure?'
}
-
else
%p
To set up this service press "Add to Slack"
=
render
"projects/services/
#{
@service
.
to_param
}
/slack_button"
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