check for existence of key instead of checking secret twice
use File.join when it's already there
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
Updated Galician (gl) translation.
Merge pull request #3362 from diaspora/non-public-error-page

show a "post is not public" message when visitor is not logged in
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
Merge pull request #3371 from stevenh512/rails_root

Rails.root and File.join cleanup [ci skip]
Autoload needs a string, not a Pathname

fixes #3373
Update Gemfile.lock

Somehow heroku_san was still locked at 3.0.1 :)
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
Merge pull request #3372 from stevenh512/use_https

Use https for git dependencies in the Gemfile

Followup to #3358
forgot to put new css file in precompile list [ci skip]
Update Rails to 3.2.6
Fix ActiveRecord queries with nested hashes

Rails 3.2.6 doesn't like them
Fix ActiveRecord queries - take two
Merge pull request #3376 from stevenh512/rails-3-2-6

Update Rails to 3.2.6
Get Spork running again

Use Rails.root.join in `spec/spec_helper.rb` to help Spork find
`helper_methods.rb` and `spec_doc.rb`.
Fix deprecation warning, :confirm option on links is deprecated

Use `:data => { :confirm => 'text' }` instead.
Merge pull request #3380 from stevenh512/fix_confirm_deprecation

Fix deprecation warning, :confirm option on links is deprecated
updated 37 locale files [ci skip]