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
001e7ca1
Commit
001e7ca1
authored
Jan 12, 2022
by
Justin Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove gif and docs link
No longer required by design
parent
4162ce60
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
2 additions
and
47 deletions
+2
-47
ee/app/assets/images/gitlab_for_slack.gif
ee/app/assets/images/gitlab_for_slack.gif
+0
-0
ee/app/assets/javascripts/integrations/gitlab_slack_application/components/gitlab_slack_application.vue
...slack_application/components/gitlab_slack_application.vue
+0
-31
ee/app/assets/javascripts/integrations/gitlab_slack_application/index.js
...avascripts/integrations/gitlab_slack_application/index.js
+0
-4
ee/app/helpers/ee/integrations_helper.rb
ee/app/helpers/ee/integrations_helper.rb
+1
-3
ee/spec/helpers/ee/integrations_helper_spec.rb
ee/spec/helpers/ee/integrations_helper_spec.rb
+1
-3
locale/gitlab.pot
locale/gitlab.pot
+0
-6
No files found.
ee/app/assets/images/gitlab_for_slack.gif
deleted
100644 → 0
View file @
4162ce60
1.46 MB
ee/app/assets/javascripts/integrations/gitlab_slack_application/components/gitlab_slack_application.vue
View file @
001e7ca1
<
script
>
<
script
>
/* eslint-disable @gitlab/vue-require-i18n-strings */
import
{
GlButton
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlIcon
}
from
'
@gitlab/ui
'
;
import
createFlash
from
'
~/flash
'
;
import
createFlash
from
'
~/flash
'
;
import
{
redirectTo
}
from
'
~/lib/utils/url_utility
'
;
import
{
redirectTo
}
from
'
~/lib/utils/url_utility
'
;
...
@@ -24,10 +23,6 @@ export default {
...
@@ -24,10 +23,6 @@ export default {
type
:
Boolean
,
type
:
Boolean
,
required
:
true
,
required
:
true
,
},
},
gitlabForSlackGifPath
:
{
type
:
String
,
required
:
true
,
},
signInPath
:
{
signInPath
:
{
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
...
@@ -44,10 +39,6 @@ export default {
...
@@ -44,10 +39,6 @@ export default {
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
},
},
docsPath
:
{
type
:
String
,
required
:
true
,
},
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -123,27 +114,5 @@ export default {
...
@@ -123,27 +114,5 @@ export default {
}}
</gl-button>
}}
</gl-button>
</
template
>
</
template
>
</div>
</div>
<div
class=
"center prepend-top-20 gl-mb-3 gl-mr-2 gl-ml-2"
>
<img
v-once
:src=
"gitlabForSlackGifPath"
class=
"gl-w-full"
/>
</div>
<div
v-once
class=
"text-center"
>
<h3>
{{ __('How it works') }}
</h3>
<div
class=
"mx-auto"
>
<code
class=
"code mx-auto gl-mb-3"
>
/gitlab
<
project-alias
>
issue show
<
id
>
</code
>
<span>
<gl-icon
name=
"arrow-right"
class=
"gl-mr-2 gl-text-gray-200"
/>
Shows the issue with id
<strong>
<
id
>
</strong>
</span>
<div
class=
"gl-mt-3"
>
<a
v-once
:href=
"docsPath"
>
{{ __('More Slack commands') }}
</a>
</div>
</div>
</div>
</div>
</div>
</template>
</template>
ee/app/assets/javascripts/integrations/gitlab_slack_application/index.js
View file @
001e7ca1
...
@@ -10,12 +10,10 @@ export default () => {
...
@@ -10,12 +10,10 @@ export default () => {
const
{
const
{
projects
,
projects
,
isSignedIn
,
isSignedIn
,
gitlabForSlackGifPath
,
signInPath
,
signInPath
,
slackLinkPath
,
slackLinkPath
,
gitlabLogoPath
,
gitlabLogoPath
,
slackLogoPath
,
slackLogoPath
,
docsPath
,
}
=
el
.
dataset
;
}
=
el
.
dataset
;
return
new
Vue
({
return
new
Vue
({
...
@@ -25,12 +23,10 @@ export default () => {
...
@@ -25,12 +23,10 @@ export default () => {
props
:
{
props
:
{
projects
:
JSON
.
parse
(
projects
),
projects
:
JSON
.
parse
(
projects
),
isSignedIn
:
parseBoolean
(
isSignedIn
),
isSignedIn
:
parseBoolean
(
isSignedIn
),
gitlabForSlackGifPath
,
signInPath
,
signInPath
,
slackLinkPath
,
slackLinkPath
,
gitlabLogoPath
,
gitlabLogoPath
,
slackLogoPath
,
slackLogoPath
,
docsPath
,
},
},
});
});
},
},
...
...
ee/app/helpers/ee/integrations_helper.rb
View file @
001e7ca1
...
@@ -40,10 +40,8 @@ module EE
...
@@ -40,10 +40,8 @@ module EE
sign_in_path:
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
sign_in_path:
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
is_signed_in:
current_user
.
present?
.
to_s
,
is_signed_in:
current_user
.
present?
.
to_s
,
slack_link_path:
slack_link_profile_slack_path
,
slack_link_path:
slack_link_profile_slack_path
,
gitlab_for_slack_gif_path:
image_path
(
'gitlab_for_slack.gif'
),
gitlab_logo_path:
image_path
(
'illustrations/gitlab_logo.svg'
),
gitlab_logo_path:
image_path
(
'illustrations/gitlab_logo.svg'
),
slack_logo_path:
image_path
(
'illustrations/slack_logo.svg'
),
slack_logo_path:
image_path
(
'illustrations/slack_logo.svg'
)
docs_path:
help_page_path
(
'user/project/integrations/gitlab_slack_application.md'
)
}
}
end
end
...
...
ee/spec/helpers/ee/integrations_helper_spec.rb
View file @
001e7ca1
...
@@ -138,10 +138,8 @@ RSpec.describe EE::IntegrationsHelper do
...
@@ -138,10 +138,8 @@ RSpec.describe EE::IntegrationsHelper do
:sign_in_path
,
:sign_in_path
,
:is_signed_in
,
:is_signed_in
,
:slack_link_path
,
:slack_link_path
,
:gitlab_for_slack_gif_path
,
:gitlab_logo_path
,
:gitlab_logo_path
,
:slack_logo_path
,
:slack_logo_path
:docs_path
)
)
end
end
...
...
locale/gitlab.pot
View file @
001e7ca1
...
@@ -17721,9 +17721,6 @@ msgstr ""
...
@@ -17721,9 +17721,6 @@ msgstr ""
msgid "How do I use file templates?"
msgid "How do I use file templates?"
msgstr ""
msgstr ""
msgid "How it works"
msgstr ""
msgid "How many days need to pass between marking entity for deletion and actual removing it."
msgid "How many days need to pass between marking entity for deletion and actual removing it."
msgstr ""
msgstr ""
...
@@ -23122,9 +23119,6 @@ msgstr ""
...
@@ -23122,9 +23119,6 @@ msgstr ""
msgid "More Information"
msgid "More Information"
msgstr ""
msgstr ""
msgid "More Slack commands"
msgstr ""
msgid "More actions"
msgid "More actions"
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