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

b016934f

Commit b016934f authored 2 years ago by pabois

Downloads
- Plain Diff

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

parents a339cb35 4e12eed0

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile 1 addition, 1 deletion

Gemfile
Gemfile.lock 7 additions, 7 deletions

Gemfile.lock
app/assets/javascripts/admin.js 0 additions, 1 deletion

app/assets/javascripts/admin.js
app/models/communication/block.rb 1 addition, 0 deletions

app/models/communication/block.rb
app/models/communication/website/imported/page.rb 1 addition, 1 deletion

app/models/communication/website/imported/page.rb
app/models/communication/website/imported/post.rb 2 additions, 2 deletions

app/models/communication/website/imported/post.rb
app/services/osuny/sanitizer.rb 1 addition, 5 deletions

app/services/osuny/sanitizer.rb
app/views/admin/communication/websites/pages/_form.html.erb 1 addition, 1 deletion

app/views/admin/communication/websites/pages/_form.html.erb
app/views/admin/communication/websites/pages/show.html.erb 1 addition, 1 deletion

app/views/admin/communication/websites/pages/show.html.erb

with 15 additions and 19 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