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

4fd6e8a4

Commit 4fd6e8a4 authored 3 years ago by pabois

Downloads
- Plain Diff

Merge branch 'master' of github.com:noesya/osuny

parents e451f46d a01e7327

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/forms.sass 0 additions, 2 deletions

app/assets/stylesheets/admin/forms.sass
app/models/communication/website/menu.rb 2 additions, 4 deletions

app/models/communication/website/menu.rb
app/models/communication/website/with_batch_publication.rb 42 additions, 0 deletions

app/models/communication/website/with_batch_publication.rb
app/models/education/school.rb 1 addition, 0 deletions

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

app/models/research/journal.rb
app/views/admin/education/programs/jekyll.html.erb 6 additions, 0 deletions

app/views/admin/education/programs/jekyll.html.erb
app/views/admin/education/teachers/jekyll.html.erb 6 additions, 0 deletions

app/views/admin/education/teachers/jekyll.html.erb

with 69 additions and 7 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