Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
ec2b0c9bf43a
Commit
cc56ca7a
authored
Apr 28, 2021
by
Georges Racinet
🦑
Browse files
Merged heptapod-stable into support branch
--HG-- branch : heptapod-0-21
parents
be2e6c62b7b3
6d5c665dedf7
Changes
14
Hide whitespace changes
Inline
Side-by-side
app/assets/images/mailers/ci_pipeline_notif_v1/heptapod-logo.gif
0 → 100644
View file @
ec2b0c9b
2.8 KB
app/assets/images/mailers/heptapod_footer_logo.gif
0 → 100644
View file @
ec2b0c9b
2.92 KB
app/assets/images/mailers/heptapod_header_logo.gif
0 → 100644
View file @
ec2b0c9b
2.8 KB
app/helpers/emails_helper.rb
View file @
ec2b0c9b
...
...
@@ -65,9 +65,9 @@ def header_logo
)
else
image_tag
(
image_url
(
'mailers/
gitlab
_header_logo.gif'
),
image_url
(
'mailers/
heptapod
_header_logo.gif'
),
size:
'55x50'
,
alt:
'
GitLab
'
alt:
'
Heptapod
'
)
end
end
...
...
app/views/layouts/mailer.html.haml
View file @
ec2b0c9b
=
content_for
:footer
do
%tr
.footer
%td
%img
.footer-logo
{
alt:
"
GitLab
"
,
src:
image_url
(
'mailers/
gitlab
_footer_logo.gif'
)
}
%img
.footer-logo
{
alt:
"
Heptapod
"
,
src:
image_url
(
'mailers/
heptapod
_footer_logo.gif'
)
}
%div
-
manage_notifications_link
=
link_to
(
_
(
"Manage all notifications"
),
profile_notifications_url
,
class:
'mng-notif-link'
)
-
help_link
=
link_to
(
_
(
"Help"
),
help_url
,
class:
'help-link'
)
...
...
app/views/layouts/notify.html.haml
View file @
ec2b0c9b
...
...
@@ -2,7 +2,7 @@
%head
%meta
{
content:
"text/html; charset=utf-8"
,
"http-equiv"
=>
"Content-Type"
}
%title
GitLab
Heptapod
=
stylesheet_link_tag
'notify'
=
yield
:head
%body
...
...
@@ -15,9 +15,9 @@
%br
-
if
@target_url
-
if
@reply_by_email
=
_
(
'Reply to this email directly or %{view_it_on_gitlab}.'
).
html_safe
%
{
view_it_on_gitlab:
link_to
(
_
(
"view it on
GitLab
"
),
@target_url
)
}
=
_
(
'Reply to this email directly or %{view_it_on_gitlab}.'
).
html_safe
%
{
view_it_on_gitlab:
link_to
(
_
(
"view it on
Heptapod
"
),
@target_url
)
}
-
else
#{
link_to
_
(
"View it on
GitLab
"
),
@target_url
}
.
#{
link_to
_
(
"View it on
Heptapod
"
),
@target_url
}
.
%br
-# Don't link the host in the line below, one link in the email is easier to quickly click than two.
=
notification_reason_text
(
@reason
)
...
...
app/views/notify/merge_when_pipeline_succeeds_email.html.haml
View file @
ec2b0c9b
...
...
@@ -61,7 +61,7 @@
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;background-color:#6b4fbb;height:4px;font-size:4px;line-height:4px;"
}
%tr
.header
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;padding:25px 0;font-size:13px;line-height:1.6;color:#5c5c5c;"
}
%img
{
alt:
"GitLab"
,
height:
"50"
,
src:
image_url
(
'mailers/ci_pipeline_notif_v1/
gitlab
-logo.gif'
),
width:
"55"
}
%img
{
alt:
"GitLab"
,
height:
"50"
,
src:
image_url
(
'mailers/ci_pipeline_notif_v1/
heptapod
-logo.gif'
),
width:
"55"
}
%tr
%td
{
style:
"font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;"
}
%table
.wrapper
{
border:
"0"
,
cellpadding:
"0"
,
cellspacing:
"0"
,
style:
"width:640px;margin:0 auto;border-collapse:separate;border-spacing:0;"
}
...
...
app/views/notify/repository_push_email.text.haml
View file @
ec2b0c9b
...
...
@@ -50,4 +50,4 @@
-
if
@message
.
target_url
\
\
View it on
GitLab
:
#{
@message
.
target_url
}
View it on
Heptapod
:
#{
@message
.
target_url
}
heptapod-ci.yml
View file @
ec2b0c9b
...
...
@@ -16,7 +16,7 @@ default:
# but it gives us in particular a working
# recent Mercurial, proper Ruby versions (of course),
# and it should already be present in all runners
image
:
"
registry.heptapod.net/heptapod/ci-images/heptapod-base:stable"
image
:
"
registry.heptapod.net/heptapod/ci-images/heptapod-base:
old
stable"
workflow
:
rules
:
...
...
@@ -171,9 +171,9 @@ rspec-regular:
rules
:
# run in development branches
-
if
:
'
$CI_HEPTAPOD_RSPEC_SCOPE'
when
:
never
-
if
:
'
$CI_PIPELINE_SOURCE
==
"merge_request_event"
&&
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
=~
/^branch\/heptapod(-stable)?$/'
-
if
:
'
$CI_PIPELINE_SOURCE
==
"merge_request_event"
&&
$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
=~
/^branch\/heptapod(-stable
|-oldstable
)?$/'
allow_failure
:
false
-
if
:
'
$CI_COMMIT_HG_BRANCH
=~
/^heptapod(-stable)?$/
&&
$CI_PIPELINE_SOURCE
==
"web"'
-
if
:
'
$CI_COMMIT_HG_BRANCH
=~
/^heptapod(-stable
|-oldstable
)?$/
&&
$CI_PIPELINE_SOURCE
==
"web"'
allow_failure
:
false
-
when
:
never
...
...
scripts/heptapod-make-push-tarball.sh
View file @
ec2b0c9b
...
...
@@ -44,6 +44,14 @@ echo "Generating SHA-256 checksum"
sha256sum
${
TARBALL_PATH
}
>
${
TARBALL_PATH
}
.sha256sum
cat
${
TARBALL_PATH
}
.sha256sum
if
[
-n
"
$HEPTAPOD_PACKAGING_GPG_PRIVKEY
"
]
;
then
`
dirname
$0
`
/heptapod-sign-package
$HEPTAPOD_PACKAGING_GPG_PRIVKEY
\
$TARBALL_PATH
else
echo
"Key not present, skipping GPG signature. "
echo
" This is normal on non-protected tags and branches"
fi
if
[
-n
"
$HEPTAPOD_TARBALL_UPLOAD_KEY
"
]
;
then
`
dirname
$0
`
/heptapod-sftp-push
\
upload.heptapod.net
\
...
...
scripts/heptapod-sign-package
0 → 100755
View file @
ec2b0c9b
#!/bin/sh
set
-eu
PRIVKEY_FILE
=
$1
ARTIFACT
=
$2
# keyring and passphrase files
# outside of build and in explicit volatile space for
# - several protections to guarantee there won't be any persistence
# - make snooping a bit harder
KEYRING
=
/dev/shm/heptapod.gpg
PASSPHRASE
=
/dev/shm/heptapod.pass
touch
$PASSPHRASE
&&
chmod
600
$PASSPHRASE
echo
-n
"
$HEPTAPOD_PACKAGING_GPG_PASSPHRASE
"
>>
$PASSPHRASE
# .gnupg/ still needed for web-of-trust files and the like
# note: install -d is idempotent
install
-m
700
-d
$HOME
/.gnupg
echo
"Importing GPG signing key"
gpg
--no-options
--batch
\
--no-default-keyring
--keyring
$KEYRING
\
--no-secmem-warning
\
--no-permission-warning
\
--pinentry-mode
loopback
--passphrase-file
$PASSPHRASE
\
--import
$PRIVKEY_FILE
echo
"Signing
$ARTIFACT
with GPG"
gpg
--no-options
--batch
\
--no-default-keyring
--keyring
$KEYRING
\
--pinentry-mode
loopback
--passphrase-file
$PASSPHRASE
\
--armor
--detach-sign
$ARTIFACT
rm
-rf
$PASSPHRASE
$KEYRING
$HOME
/.gnupg
scripts/heptapod_knapsack.sh
View file @
ec2b0c9b
...
...
@@ -28,10 +28,12 @@ set -u
if
[
"
$HEPTAPOD_RSPEC_SCOPE
"
=
"extended"
]
;
then
KNAPSACK_TEST_FILE_PATTERN
=
"spec/{"
\
"helpers/storage_helper,"
\
"helpers/emails_helper,"
\
"lib/gitlab,"
\
"lib/gitlab/*,"
\
"lib/gitlab/**/*,"
\
"mailers_emails/pipelines,"
\
"mailers/*,"
\
"mailers/emails/*,"
\
"models/*,"
\
"models/**/*,"
\
"presenters/*,"
\
...
...
@@ -56,11 +58,13 @@ else
"helpers/application_settings_helper,"
\
"helpers/vcs_type_helper,"
\
"helpers/storage_helper,"
\
"helpers/emails_helper,"
\
"lib/gitlab,"
\
"lib/gitlab/mercurial/*,"
\
"lib/gitlab/*_access*,"
\
"lib/gitlab/git/*,"
\
"mailers/emails/pipelines,"
\
"mailers/notify,"
\
"models/application_setting,"
\
"models/ci/job_*,"
\
"models/ci/pipeline*,"
\
...
...
spec/helpers/emails_helper_spec.rb
View file @
ec2b0c9b
...
...
@@ -239,7 +239,7 @@ def validate_time_string(time_limit, expected_string)
create
:appearance
,
header_logo:
nil
expect
(
header_logo
).
to
eq
(
%{<img alt="
GitLab
" src="/images/mailers/
gitlab
_header_logo.gif" width="55" height="50" />}
%{<img alt="
Heptapod
" src="/images/mailers/
heptapod
_header_logo.gif" width="55" height="50" />}
)
end
end
...
...
@@ -247,7 +247,7 @@ def validate_time_string(time_limit, expected_string)
context
'there is no brand item'
do
it
'returns the default header logo'
do
expect
(
header_logo
).
to
eq
(
%{<img alt="
GitLab
" src="/images/mailers/
gitlab
_header_logo.gif" width="55" height="50" />}
%{<img alt="
Heptapod
" src="/images/mailers/
heptapod
_header_logo.gif" width="55" height="50" />}
)
end
end
...
...
spec/support/shared_examples/mailers/notify_shared_examples.rb
View file @
ec2b0c9b
...
...
@@ -102,8 +102,8 @@
include_examples
'an email with X-GitLab headers containing IDs'
include_examples
'a new thread email with reply-by-email enabled'
it
'includes "Reply to this email directly or <View it on
GitLab
>"'
do
expect
(
subject
.
default_part
.
body
).
to
include
(
%(Reply to this email directly or <a href="#{Gitlab::UrlBuilder.build(model)}">view it on
GitLab
</a>.)
)
it
'includes "Reply to this email directly or <View it on
Heptapod
>"'
do
expect
(
subject
.
default_part
.
body
).
to
include
(
%(Reply to this email directly or <a href="#{Gitlab::UrlBuilder.build(model)}">view it on
Heptapod
</a>.)
)
end
context
'when reply-by-email is enabled with incoming address with %{key}'
do
...
...
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