fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png
This commit is contained in:
parent
b575983c22
commit
a03423309d
4 changed files with 15 additions and 5 deletions
|
|
@ -8,10 +8,6 @@ class AppConfig < Settingslogic
|
||||||
source File.join(Rails.root, "config", "application.yml")
|
source File.join(Rails.root, "config", "application.yml")
|
||||||
namespace Rails.env
|
namespace Rails.env
|
||||||
|
|
||||||
if self[:ca_file].blank? && Rails.env.development?
|
|
||||||
OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.load!
|
def self.load!
|
||||||
if no_config_file? && !have_old_config_file?
|
if no_config_file? && !have_old_config_file?
|
||||||
$stderr.puts <<-HELP
|
$stderr.puts <<-HELP
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
#people_stream.stream
|
#people_stream.stream
|
||||||
- for friend in @friends
|
- for friend in @friends
|
||||||
= render :partial => 'people/person', :locals => {:request => friend.request, :person => friend.person, :contact => friend.contact}
|
= render :partial => 'people/person', :locals => {:person => friend.person, :contact => friend.contact}
|
||||||
|
|
||||||
%br
|
%br
|
||||||
%br
|
%br
|
||||||
|
|
|
||||||
14
config/initializers/ignore_ssl_in_development.rb
Normal file
14
config/initializers/ignore_ssl_in_development.rb
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
# Copyright (c) 2010, Diaspora Inc. This file is
|
||||||
|
# licensed under the Affero General Public License version 3 or later. See
|
||||||
|
# the COPYRIGHT file.
|
||||||
|
|
||||||
|
if AppConfig[:ca_file].blank? && (Rails.env == "development")
|
||||||
|
module OpenSSL
|
||||||
|
module SSL
|
||||||
|
remove_const :VERIFY_PEER
|
||||||
|
end
|
||||||
|
end
|
||||||
|
OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 4.4 KiB |
Loading…
Reference in a new issue