nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12228 commits 4 branches 0 tags 121 MiB
Commit graph

12228 commits

This branch
This branch
All branches
Author SHA1 Message Date
movilla
d5aefaa64c Login with pod_name 2012-06-16 22:51:38 +02:00
Maxwell Salzberg
51661091d5 Merge pull request #3385 from Raven24/federation-colors 
Federation logger stuff[ci skip]
 2012-06-15 11:55:25 -07:00
Florian Staudacher
0c8621fa9e Merge pull request #3386 from diaspora/nicer-cukes 
cleanup session cukes
 2012-06-15 11:19:32 -07:00
Florian Staudacher
0fb0bf00af be more specific in config, point to more info [ci skip] 2012-06-15 20:14:51 +02:00
Florian Staudacher
b184415c19 cleanup session cukes 2012-06-15 19:30:08 +02:00
Florian Staudacher
bff069ab19 tinker with log messages for readability 2012-06-15 17:43:14 +02:00
Florian Staudacher
8f21657179 add all the colors of the rainbow, log into the same file 
and throw in some formatting
 2012-06-15 15:30:49 +02:00
Florian Staudacher
0ce411c11c fix startup error for integration envs 2012-06-15 15:30:49 +02:00
Florian Staudacher
6546f63208 Merge pull request #3383 from ChaosCoder/patch-1 
Removed double "the" in section "Quick Start - Step 2"
 2012-06-14 16:49:16 -07:00
Andreas Ganske
87a8bf3520 Removed double "the" in section "Quick Start - Step 2" 2012-06-15 02:19:19 +03:00
Jonne Haß
aa3a6f9439 updated 37 locale files [ci skip] 2012-06-14 15:53:18 +02:00
Steven Hancock
7e41974666 Merge pull request #3380 from stevenh512/fix_confirm_deprecation 
Fix deprecation warning, :confirm option on links is deprecated
 2012-06-14 02:18:38 -07:00
Steven Hancock
9280753950 Fix deprecation warning, :confirm option on links is deprecated 
Use `:data => { :confirm => 'text' }` instead.
 2012-06-14 01:56:51 -07:00
Steven Hancock
ee6941fa18 Get Spork running again 
Use Rails.root.join in `spec/spec_helper.rb` to help Spork find
`helper_methods.rb` and `spec_doc.rb`.
 2012-06-14 00:53:10 -07:00
Steven Hancock
01449f765e Merge pull request #3376 from stevenh512/rails-3-2-6 
Update Rails to 3.2.6
 2012-06-13 15:10:42 -07:00
Steven Hancock
033e8e5cb6 Fix ActiveRecord queries - take two 2012-06-13 14:52:25 -07:00
Steven Hancock
79b7d38158 Fix ActiveRecord queries with nested hashes 
Rails 3.2.6 doesn't like them
 2012-06-13 14:18:09 -07:00
Steven Hancock
a2ccf685ca Update Rails to 3.2.6 2012-06-13 06:19:32 -07:00
Florian Staudacher
acc62e7380 forgot to put new css file in precompile list [ci skip] 2012-06-12 13:19:05 +02:00
Steven Hancock
3547654e6a Merge pull request #3372 from stevenh512/use_https 
Use https for git dependencies in the Gemfile

Followup to #3358
 2012-06-11 20:29:12 -07:00
Steven Hancock
dc2184724b Use https for git dependencies in the Gemfile 
This is useful if your development and/or production setup is behind
a firewall and you can't use `git://`. Followup to #3358
 2012-06-11 20:24:54 -07:00
Steven Hancock
cac744c0b0 Update Gemfile.lock 
Somehow heroku_san was still locked at 3.0.1 :)
 2012-06-11 20:23:21 -07:00
Steven Hancock
2b47848da9 Autoload needs a string, not a Pathname 
fixes #3373
 2012-06-11 15:11:05 -07:00
Maxwell Salzberg
c764bae345 Merge pull request #3371 from stevenh512/rails_root 
Rails.root and File.join cleanup [ci skip]
 2012-06-11 11:01:47 -07:00
Steven Hancock
a8de3a5a3f Rails.root and File.join cleanup 
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
 2012-06-11 03:13:20 -07:00
Florian Staudacher
e021fd821d Merge pull request #3362 from diaspora/non-public-error-page 
show a "post is not public" message when visitor is not logged in
 2012-06-11 02:35:48 -07:00
Adrián Chaves Fernández (Gallaecio)
994ece57f5 Updated Galician (gl) translation. 2012-06-10 12:57:09 +02:00
Maxwell Salzberg
6e39ffa3da Merge pull request #3363 from fermionic/parent-signature-fails-with-leading-whitespace 
strip comment text upon comment creation
 2012-06-09 13:08:26 -07:00
Zach Prezkuta
9f6d84141c fix incorrect comment on RSpec text 2012-06-09 09:34:06 -06:00
Zach Prezkuta
44e43158cc add rspec test and make fix more rails-y 2012-06-08 22:51:16 -06:00
Zach Prezkuta
ed51f34ebb strip comment text upon comment creation 2012-06-08 22:51:16 -06:00
Florian Staudacher
8ca39f5936 show a "post is not public" message when visitor is not logged in 
and tries to access a show page of a non-public post
 2012-06-07 22:16:37 +02:00
Florian Staudacher
09cf60f794 use File.join when it's already there 2012-06-07 21:19:41 +02:00
Maxwell Salzberg
260a116e87 Merge pull request #3358 from nsdevaraj/patch-1 
Edited git to https for access behind firewalls [ci skip]
 2012-06-07 10:53:12 -07:00
Maxwell Salzberg
a15b239c51 Merge pull request #3359 from wubwubwubcr3w/update_heroku_san 
update heroku_san gem [ci skip]
 2012-06-05 11:13:41 -07:00
Jonne Haß
46a01664bb fix minor typo: eliminate double spaces [ci skip] 2012-06-05 19:07:44 +02:00
wubwubwubcr3w
8e4e5545eb update heroku_san gem 2012-06-05 16:07:27 +02:00
Daniel Grippi
5b424e7d94 don't use quotes for chartbeat (it's picky) [ci skip] 2012-06-05 00:14:00 -07:00
Daniel Grippi
44f2b7ae44 Update master 2012-06-04 23:47:20 -07:00
N.S.Devaraj
94e5b4dc7b Update master 2012-06-05 11:17:26 +05:30
Maxwell Salzberg
9cf946b20e use a smaller thumb on the home stream 2012-06-04 15:19:05 -07:00
Maxwell Salzberg
9071540400 use pod name helper in emails 2012-06-04 14:04:39 -07:00
Maxwell Salzberg
1da029a22f this stopped working because there is a new way to render views by default in spec_helper.rb 2012-06-04 12:49:24 -07:00
Maxwell Salzberg
304c33f19e explicitly render_views in publics controller 2012-06-04 12:49:24 -07:00
Maxwell Salzberg
0975488964 possible rspec bug? 
updating from 2.9 ~> 2.10 causes
spec/controllers/publics_controller_spec.rb  to break.  Namely, it now
seems that the host_meta, and web finger actions now return successful
http codes, but have blank bodies. Running this code by hand shows that
the response bodies are indeed not  blank, as reported by rspec-rails
2.9.x
 2012-06-04 12:49:24 -07:00
Maxwell Salzberg
ebf2543586 Merge pull request #3355 from diaspora/update-gems 
update a bunch more unlocked gems [ci skip]
 2012-06-04 00:12:54 -07:00
Maxwell Salzberg
b0eeb11464 update a bunch more unlocked gems 2012-06-03 23:52:20 -07:00
Maxwell Salzberg
d62a2ffc78 according to rspec-rails docs, rspec-rails should be in both test and development groups. Also, remove some implied gems which are sucked in by rspec-rails 2012-06-03 23:45:49 -07:00
Maxwell Salzberg
89406b568e update a bunch of gems that DONT break the build 2012-06-03 23:34:10 -07:00
Maxwell Salzberg
4eb95a1b6b Merge pull request #3353 from SuperTux88/fix-reshare-link-border 
remove border from reshare link [ci skip]
 2012-06-03 23:09:22 -07:00