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

c73566de

Commit c73566de authored 2 years ago by Arnaud Levy

Downloads
- Patches
- Plain Diff

helper without conflict

parent ee592661

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/stylesheets/admin/pure/style.sass 2 additions, 1 deletion

app/assets/stylesheets/admin/pure/style.sass
app/helpers/admin/application_helper.rb 5 additions, 1 deletion

app/helpers/admin/application_helper.rb
app/views/admin/layouts/themes/pure/_footer.html.erb 1 addition, 1 deletion

app/views/admin/layouts/themes/pure/_footer.html.erb
app/views/admin/university/alumni/show.html.erb 16 additions, 42 deletions

app/views/admin/university/alumni/show.html.erb
app/views/admin/university/organizations/show.html.erb 75 additions, 103 deletions

app/views/admin/university/organizations/show.html.erb
app/views/admin/university/people/experiences/_list.html.erb 23 additions, 0 deletions

app/views/admin/university/people/experiences/_list.html.erb
config/locales/university/fr.yml 1 addition, 1 deletion

config/locales/university/fr.yml

with 123 additions and 149 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