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
bc80b81c
Commit
bc80b81c
authored
Jan 18, 2022
by
Tom Quirk
Committed by
Natalia Tepluhina
Jan 18, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish Slack application edit page UI
Changelog: changed EE: true
parent
45e72f88
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
24 deletions
+32
-24
ee/app/views/projects/services/gitlab_slack_application/_help.html.haml
...rojects/services/gitlab_slack_application/_help.html.haml
+7
-7
ee/app/views/projects/services/gitlab_slack_application/_slack_integration_form.html.haml
...itlab_slack_application/_slack_integration_form.html.haml
+16
-17
locale/gitlab.pot
locale/gitlab.pot
+9
-0
No files found.
ee/app/views/projects/services/gitlab_slack_application/_help.html.haml
View file @
bc80b81c
.
card
.
info-well
.
card-body
.
well-segment
%p
%p
=
_
(
"This service allows users to perform common operations on this project by entering slash commands in Slack."
)
=
_
(
"This service allows users to perform common operations on this project by entering slash commands in Slack."
)
=
external_link
_
(
'View documentation
'
),
help_page_path
(
'user/project/integrations/gitlab_slack_application.md'
)
=
link_to
_
(
'Learn more
'
),
help_page_path
(
'user/project/integrations/gitlab_slack_application.md'
)
%p
.inline
%p
=
_
(
"See the list of available commands in Slack after setting up this service by entering"
)
=
_
(
"See the list of available commands in Slack after setting up this service by entering"
)
%kbd
.inline
/gitlab help
%kbd
.inline
/gitlab help
-
if
integration
.
project_level?
-
if
integration
.
project_level?
=
render
"projects/services/
#{
integration
.
to_param
}
/slack_integration_form"
,
integration:
integration
=
render
"projects/services/
#{
integration
.
to_param
}
/slack_integration_form"
,
integration:
integration
ee/app/views/projects/services/gitlab_slack_application/_slack_integration_form.html.haml
View file @
bc80b81c
-
slack_integration
=
integration
.
slack_integration
-
slack_integration
=
integration
.
slack_integration
-
if
slack_integration
-
if
slack_integration
%table
.
table
%table
.
gl-table.gl-w-full
%colgroup
%colgroup
%col
%col
{
width:
"25%"
}
%col
%col
{
width:
"35%"
}
%col
%col
{
width:
"20%"
}
%col
%col
%thead
%thead
%tr
%tr
%th
Team name
%th
=
s_
(
'SlackIntegration|Team name'
)
%th
Project alias
%th
=
s_
(
'SlackIntegration|Project alias'
)
%th
Created at
%th
=
_
(
'Created'
)
%th
Actions
%th
%tr
%tr
%td
%td
{
class:
'gl-py-3!'
}
=
slack_integration
.
team_name
=
slack_integration
.
team_name
%td
%td
{
class:
'gl-py-3!'
}
=
slack_integration
.
alias
=
slack_integration
.
alias
%td
%td
{
class:
'gl-py-3!'
}
=
time_ago_in_words
slack_integration
.
created_at
=
time_ago_with_tooltip
(
slack_integration
.
created_at
)
ago
%td
{
class:
'gl-py-3!'
}
%td
.controls
.controls
-
project
=
integration
.
project
-
project
=
integration
.
project
=
link_to
'Edit'
,
edit_project_settings_slack_path
(
project
),
class:
'btn gl-button btn-default btn-sm
'
=
link_to
_
(
'Edit'
),
edit_project_settings_slack_path
(
project
),
class:
'btn gl-button btn-default
'
=
link_to
'Remove'
,
project_settings_slack_path
(
project
),
method: :delete
,
class:
'btn gl-button btn-danger btn-sm
'
,
data:
{
confirm:
'Are you sure?'
}
=
link_to
sprite_icon
(
'remove'
,
css_class:
'gl-icon'
),
project_settings_slack_path
(
project
),
method: :delete
,
class:
'btn gl-button btn-danger btn-danger-secondary
'
,
data:
{
confirm:
'Are you sure?'
}
-
else
-
else
%p
To set up this service press "Add to Slack"
%p
=
s_
(
'SlackIntegration|To set up this integration press "Add to Slack"'
)
=
render
"projects/services/
#{
integration
.
to_param
}
/slack_button"
,
project:
@project
=
render
"projects/services/
#{
integration
.
to_param
}
/slack_button"
,
project:
@project
locale/gitlab.pot
View file @
bc80b81c
...
@@ -33193,12 +33193,21 @@ msgstr ""
...
@@ -33193,12 +33193,21 @@ msgstr ""
msgid "SlackIntegration|GitLab for Slack"
msgid "SlackIntegration|GitLab for Slack"
msgstr ""
msgstr ""
msgid "SlackIntegration|Project alias"
msgstr ""
msgid "SlackIntegration|Select a GitLab project to link with your Slack workspace."
msgid "SlackIntegration|Select a GitLab project to link with your Slack workspace."
msgstr ""
msgstr ""
msgid "SlackIntegration|Sends notifications about project events to Slack channels."
msgid "SlackIntegration|Sends notifications about project events to Slack channels."
msgstr ""
msgstr ""
msgid "SlackIntegration|Team name"
msgstr ""
msgid "SlackIntegration|To set up this integration press \"Add to Slack\""
msgstr ""
msgid "SlackService|1. %{slash_command_link_start}Add a slash command%{slash_command_link_end} in your Slack team using this information:"
msgid "SlackService|1. %{slash_command_link_start}Add a slash command%{slash_command_link_end} in your Slack team using this information:"
msgstr ""
msgstr ""
...
...
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