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

431a9e03

Unverified Commit 431a9e03 authored 2 years ago by Sébastien Gaya

Downloads
- Plain Diff

Merge branch 'main' into fix/trix-and-sanitization

parents 9f0026b3 c044b85b

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/stylesheets/extranet/pages/_home.sass 4 additions, 0 deletions

app/assets/stylesheets/extranet/pages/_home.sass
app/models/university/person/with_experiences.rb 2 additions, 1 deletion

app/models/university/person/with_experiences.rb
app/models/university/person/with_research.rb 12 additions, 2 deletions

app/models/university/person/with_research.rb
app/models/user.rb 1 addition, 0 deletions

app/models/user.rb
app/models/user/with_authorship.rb 10 additions, 0 deletions

app/models/user/with_authorship.rb

with 29 additions and 3 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