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

d31a37fa

Unverified Commit d31a37fa authored 3 years ago by Sébastien Gaya

Downloads
- Plain Diff

Merge branch 'master' into dev/roles

parents 9024b14e a3627e02

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/models/communication/website.rb 2 additions, 1 deletion

app/models/communication/website.rb
app/models/communication/website/with_abouts.rb 17 additions, 4 deletions

app/models/communication/website/with_abouts.rb
app/models/communication/website/with_menu_items.rb 2 additions, 2 deletions

app/models/communication/website/with_menu_items.rb
app/models/education/school.rb 6 additions, 1 deletion

app/models/education/school.rb
app/models/research/journal.rb 1 addition, 1 deletion

app/models/research/journal.rb
app/models/university/person.rb 9 additions, 0 deletions

app/models/university/person.rb

with 37 additions and 9 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