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

183ac75c

Commit 183ac75c authored 14 years ago by danielvincent

Downloads
- Plain Diff

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

parents 6d8b6701 6fa82490

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/aspects_controller.rb 10 additions, 1 deletion

app/controllers/aspects_controller.rb
app/models/user.rb 1 addition, 1 deletion

app/models/user.rb
app/views/aspects/manage.html.haml 6 additions, 1 deletion

app/views/aspects/manage.html.haml
app/views/people/show.html.haml 6 additions, 5 deletions

app/views/people/show.html.haml
config/routes.rb 1 addition, 0 deletions

config/routes.rb
public/javascripts/aspect-edit.js 21 additions, 0 deletions

public/javascripts/aspect-edit.js
public/stylesheets/sass/application.sass 2 additions, 1 deletion

public/stylesheets/sass/application.sass
spec/controllers/aspects_controller_spec.rb 10 additions, 0 deletions

spec/controllers/aspects_controller_spec.rb

with 57 additions and 9 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