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

7b58c1a6

Commit 7b58c1a6 authored 8 years ago by Eugen Rochko

Downloads
- Plain Diff

Merge branch 'mastodon-site-api' of https://github.com/marrus-sh/ardipithecus...

Merge branch 'mastodon-site-api' of https://github.com/marrus-sh/ardipithecus into marrus-sh-mastodon-site-api

parents 74ae158c e245115f

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/api/v1/site_controller.rb 8 additions, 0 deletions

app/controllers/api/v1/site_controller.rb
app/views/api/v1/site/index.rabl 14 additions, 0 deletions

app/views/api/v1/site/index.rabl
config/routes.rb 1 addition, 0 deletions

config/routes.rb
docs/Using-the-API/API.md 8 additions, 0 deletions

docs/Using-the-API/API.md

with 31 additions and 0 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