Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

mastodon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

aed25932

Commit aed25932 authored 8 years ago by Eugen Rochko

Downloads
- Patches
- Plain Diff

Add OEmbed iframe HTML, convert emojis on public pages, increase size of attachment thumbnails

parent 6de079a5

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/application_public.js 1 addition, 0 deletions

app/assets/javascripts/application_public.js
app/assets/javascripts/extras.jsx 8 additions, 0 deletions

app/assets/javascripts/extras.jsx
app/assets/stylesheets/application.scss 12 additions, 0 deletions

app/assets/stylesheets/application.scss
app/assets/stylesheets/stream_entries.scss 21 additions, 0 deletions

app/assets/stylesheets/stream_entries.scss
app/controllers/api/oembed_controller.rb 2 additions, 2 deletions

app/controllers/api/oembed_controller.rb
app/controllers/stream_entries_controller.rb 9 additions, 0 deletions

app/controllers/stream_entries_controller.rb
app/models/media_attachment.rb 2 additions, 2 deletions

app/models/media_attachment.rb
app/views/api/oembed/show.json.rabl 2 additions, 2 deletions

app/views/api/oembed/show.json.rabl
app/views/layouts/embedded.html.haml 8 additions, 0 deletions

app/views/layouts/embedded.html.haml
app/views/stream_entries/embed.html.haml 2 additions, 0 deletions

app/views/stream_entries/embed.html.haml
config/routes.rb 5 additions, 1 deletion

config/routes.rb

with 72 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