Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

diaspora
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

d4702aef

Commit d4702aef authored 14 years ago by ilya

Downloads
- Plain Diff

Merge branch 'master' of github.com:diaspora/diaspora

parents 9727b356 adbe5f7c

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/application_controller.rb 4 additions, 0 deletions

app/controllers/application_controller.rb
app/controllers/status_messages_controller.rb 2 additions, 1 deletion

app/controllers/status_messages_controller.rb
app/views/layouts/application.html.haml 3 additions, 2 deletions

app/views/layouts/application.html.haml
app/views/shared/_public_explain.haml 2 additions, 2 deletions

app/views/shared/_public_explain.haml
spec/controllers/status_message_controller_spec.rb 37 additions, 0 deletions

spec/controllers/status_message_controller_spec.rb

with 48 additions and 5 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