2ace9b47b1
Hardly a total fix, but it's a start. Based on meitar/diaspora:b5c01598.
* app/models/services/tumblr.rb: style: double-quote string
Line 22. Change from single-quotes.
* app/models/services/tumblr.rb: parse URL only for blogs we care about
...which in this case is just the primary.
This also fixes the failed test in 7079fda (and by extension, 7a1d3a9).
* spec/models/services/tumblr_spec.rb: Add "primary" flag to test user-info
* spec/models/services/tumblr_spec.rb: Add a secondary blog to test user-info
This should not cause a request to be issued, so we can continue to
expect the request for the primary blog only. Any request for the
secondary indicates a bug in the service implementation.
* spec/models/services/tumblr_spec.rb: Make the second blog returned the primary
Just to catch if it's picking the first one
* app/models/services/tumblr.rb: use blogs.find instead of blogs.each
Since we're only handling the primary blog, this should be easy enough
* app/models/services/tumblr.rb: Remove redundant if block
The condition it would have caught is dealt with by the ifnone on the find
* app/models/services/tumblr.rb: Style: remove space between { and |
|
||
|---|---|---|
| app | ||
| bin | ||
| config | ||
| db | ||
| features | ||
| graphics | ||
| lib | ||
| public | ||
| script | ||
| spec | ||
| tmp/pids | ||
| vendor | ||
| .editorconfig | ||
| .foreman | ||
| .gitignore | ||
| .hound.yml | ||
| .jshintignore | ||
| .jshintrc | ||
| .rspec | ||
| .rubocop.yml | ||
| .ruby-gemset | ||
| .ruby-version | ||
| .slugignore | ||
| .travis.yml | ||
| AUTHORS | ||
| browserlist | ||
| Changelog.md | ||
| CODE_OF_CONDUCT.md | ||
| config.ru | ||
| COPYRIGHT | ||
| FederationProcfile | ||
| Gemfile | ||
| Gemfile.lock | ||
| GNU-AGPL-3.0 | ||
| Guardfile | ||
| Procfile | ||
| Rakefile | ||
| README.md | ||
| redis-integration1.conf | ||
| redis-integration2.conf | ||
diaspora*
A privacy-aware, distributed, open source social network
master: 
stable: 
|
develop: 
|
Project site | Wiki | Bugtracker | Discussions | Mailing lists | License | Authors
Installation
You don't have to install diaspora* to use the network. There are many servers connected to diaspora*s network which are open to anyone, and you can create an account on one of these servers. Have a look at our tips for finding a home, or you can just go straight to the list of open servers to sign up.
Want to own your data and install diaspora*? Whether you just want to try it out, want to install it on your server or want to contribute and need a development setup, our installation guides will get you started!
Questions?
Have a look at our FAQs for users, for pod administrators or for developers.
Still haven't found an answer? Talk to us! Read how we communicate. We're here to answer all your questions.
Contribute
To keep diaspora* growing and improving we need all help we can get. Whether you can contribute code, ideas, translations, bug reports or simply extend the community as a helpful user or pod administrator, your help is welcome!
Everyone interacting in diaspora’s codebases, issue trackers, chat rooms, mailing lists, the wiki, and the Loomio group is expected to follow the diaspora* code of conduct.
Security
Found a security issue? Please disclose it responsibly. We have a team of developers listening to security@diasporafoundation.org. The PGP fingerprint is AB0D AB02 0FC5 D398 03AB 3CE1 6F70 243F 27AD 886A