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

7d3984c0

Commit 7d3984c0 authored 1 year ago by Arnaud Levy

Downloads
- Plain Diff

Merge branch 'main' into headings

parents a26b9753 8fadc130

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/models/communication/block/template/program.rb 7 additions, 0 deletions

app/models/communication/block/template/program.rb
app/models/education/diploma.rb 5 additions, 1 deletion

app/models/education/diploma.rb
app/views/admin/communication/blocks/components/program/_edit.html.erb 1 addition, 1 deletion

...in/communication/blocks/components/program/_edit.html.erb
app/views/admin/communication/blocks/components/string/_edit.html.erb 1 addition, 1 deletion

...min/communication/blocks/components/string/_edit.html.erb
app/views/admin/communication/blocks/templates/partners/_edit.html.erb 4 additions, 1 deletion

...in/communication/blocks/templates/partners/_edit.html.erb
config/locales/communication/en.yml 9 additions, 8 deletions

config/locales/communication/en.yml
config/locales/communication/fr.yml 9 additions, 8 deletions

config/locales/communication/fr.yml
test/models/communication/website/connection_test.rb 4 additions, 4 deletions

test/models/communication/website/connection_test.rb

with 40 additions and 24 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