Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

Admin
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

6f92a3cf

Unverified Commit 6f92a3cf authored 2 years ago by Sébastien Gaya

Downloads
- Plain Diff

Merge branch 'main' into i18n

parents f6ccf7a1 ec7a1f66

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/models/communication/block.rb 1 addition, 0 deletions

app/models/communication/block.rb
app/models/communication/website/post.rb 1 addition, 1 deletion

app/models/communication/website/post.rb
app/views/admin/communication/blocks/components/file/_edit.html.erb 1 addition, 0 deletions

...admin/communication/blocks/components/file/_edit.html.erb
app/views/admin/communication/blocks/edit.html.erb 11 additions, 4 deletions

app/views/admin/communication/blocks/edit.html.erb
app/views/admin/communication/unsplash/_selector.html.erb 0 additions, 1 deletion

app/views/admin/communication/unsplash/_selector.html.erb
config/locales/communication/en.yml 1 addition, 1 deletion

config/locales/communication/en.yml
config/locales/communication/fr.yml 1 addition, 1 deletion

config/locales/communication/fr.yml

with 16 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment