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

9309be2d

Commit 9309be2d authored 14 years ago by Raphael

Downloads
- Plain Diff

Merge branch 'import'

Conflicts:
	spec/models/user/invite_spec.rb

parents ea36790e 733fb3b6

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile 2 additions, 0 deletions

Gemfile
Gemfile.lock 14 additions, 7 deletions

Gemfile.lock
app/controllers/registrations_controller.rb 1 addition, 1 deletion

app/controllers/registrations_controller.rb
app/controllers/users_controller.rb 27 additions, 1 deletion

app/controllers/users_controller.rb
app/models/post.rb 1 addition, 0 deletions

app/models/post.rb
app/models/user.rb 6 additions, 2 deletions

app/models/user.rb
app/views/registrations/new.html.haml 24 additions, 0 deletions

app/views/registrations/new.html.haml
config/routes.rb 1 addition, 0 deletions

config/routes.rb
lib/diaspora/exporter.rb 34 additions, 19 deletions

lib/diaspora/exporter.rb
lib/diaspora/importer.rb 179 additions, 0 deletions

lib/diaspora/importer.rb
spec/lib/exporter_spec.rb 37 additions, 5 deletions

spec/lib/exporter_spec.rb
spec/lib/importer_spec.rb 234 additions, 0 deletions

spec/lib/importer_spec.rb
spec/lib/verify_spec.rb 109 additions, 0 deletions

spec/lib/verify_spec.rb
spec/models/aspect_spec.rb 1 addition, 1 deletion

spec/models/aspect_spec.rb

with 670 additions and 36 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