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

0df2dbaa

Unverified Commit 0df2dbaa authored 2 years ago by Sébastien Gaya

Downloads
- Plain Diff

Merge branch 'master' into rework-dependencies

parents 750c8613 211945e0

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile.lock 29 additions, 21 deletions

Gemfile.lock
app/assets/stylesheets/commons/_summernote.sass 6 additions, 1 deletion

app/assets/stylesheets/commons/_summernote.sass
app/views/admin/application/_dependencies.html.erb 8 additions, 10 deletions

app/views/admin/application/_dependencies.html.erb
app/views/admin/communication/blocks/components/image/_preview.html.erb 1 addition, 1 deletion

...n/communication/blocks/components/image/_preview.html.erb
app/views/admin/communication/websites/pages/show.html.erb 23 additions, 27 deletions

app/views/admin/communication/websites/pages/show.html.erb
app/views/admin/communication/websites/posts/show.html.erb 21 additions, 37 deletions

app/views/admin/communication/websites/posts/show.html.erb
config/locales/communication/en.yml 2 additions, 2 deletions

config/locales/communication/en.yml
config/locales/communication/fr.yml 5 additions, 4 deletions

config/locales/communication/fr.yml

with 95 additions and 103 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