From a03423309dab0676ed6902eadb64d050ffb0c96b Mon Sep 17 00:00:00 2001 From: Ilya Zhitomirskiy Date: Thu, 9 Jun 2011 15:12:35 -0700 Subject: [PATCH] fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png --- app/models/app_config.rb | 4 ---- .../users/getting_started/_step_3.html.haml | 2 +- .../initializers/ignore_ssl_in_development.rb | 14 ++++++++++++++ public/images/services/facebook_sign_in.png | Bin 1661 -> 4458 bytes 4 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 config/initializers/ignore_ssl_in_development.rb diff --git a/app/models/app_config.rb b/app/models/app_config.rb index 9bfa243ec..08c955601 100644 --- a/app/models/app_config.rb +++ b/app/models/app_config.rb @@ -8,10 +8,6 @@ class AppConfig < Settingslogic source File.join(Rails.root, "config", "application.yml") namespace Rails.env - if self[:ca_file].blank? && Rails.env.development? - OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE - end - def self.load! if no_config_file? && !have_old_config_file? $stderr.puts <<-HELP diff --git a/app/views/users/getting_started/_step_3.html.haml b/app/views/users/getting_started/_step_3.html.haml index 232ef0ef5..267ece875 100644 --- a/app/views/users/getting_started/_step_3.html.haml +++ b/app/views/users/getting_started/_step_3.html.haml @@ -12,7 +12,7 @@ #people_stream.stream - 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 diff --git a/config/initializers/ignore_ssl_in_development.rb b/config/initializers/ignore_ssl_in_development.rb new file mode 100644 index 000000000..501f706f2 --- /dev/null +++ b/config/initializers/ignore_ssl_in_development.rb @@ -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 + + diff --git a/public/images/services/facebook_sign_in.png b/public/images/services/facebook_sign_in.png index 4e7766bcad5c627ba0969f9df4a4adffb0eaf2c7..f3fb3d8efe03919dbe6d6d82de4febbdfb275314 100644 GIT binary patch literal 4458 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 literal 1661 zcmV-@27>vCP)~SM{{Fzm+-P{L-{bAc&f#u-uXKa6 zae%RMfwJ%M_RG-Xw7b=GgR;-n%u(;Eyvd`-6^KyZ)%FyD}+2^RS&Ze);=IQZkd#%{q>34>-<>>Hhdabp* z*8Tnd`1$*pq{oYwzqr5G^!54B*5$0U(fRuP=j!rpe6H;7^qQo|#LC{w(c zaDT9mn!#sxtV>*!YI?2c>+-I)(xtA=>+bY|kGrO?&bq+SSzeXyyr(2||Q z(%0sChqlbpV{@s&#@u9dse+HXNm`O(bE#x?s!3UrVRET}jk;lRsYzLpVR5J=G;fb7(31cF z17b-;K~#9!)sFXf3}F<8vFzQfNJtP2`8J4z*bu#Jh>&csL=T@Hy)Ds8L|@S&x``5X zjoy2k=)ITKTlD@PxRd$jOfbq%HlB0lyYIPk&wHL+IhouVMh2-hw<7@mQK7}=wMT#0#P|Z&T&E(*z zEQq+Ado!BAdp ztPm0sLNtJi8cWVhRQ^gWv{L1;Dpg6f>R~l%)*`j*)FqbidgUs~iuEHJkjNm?uu+sH zoJ3n=^r+U@Y;KahplO7ySwlja*NJV>vTl%}Rcrjwrfs{p_N-bNsMbMWUR9$EP{7<# z*#+R!DSzkCF3^>7-MYs^584xYQLcBNzR-_K^oIchVUWG+V9J?kS;LS7Jm7{78_o($ z@$sQ_#K=*x(R4J789CN(T;jm-20MkMA`@UDt7ZcmCQTke85(L+epH(Z)2Q7sJX% zyK+4y^~TLorxH(yaO*aN8%0*l1~%M*yP^!Lxl~Y14jHcRxpyC*2lj{kps?%rJbJ9P zed2OG#c}_c3wi!RUOr~k%J>0P%Tz%%Ib>vN@X~6q`M=8iSD@N!6@XQ8c=J{Z@6dN| z{~f5dPX*QF@cx7QLA8%6s3wQ^pWM$c)INW4KdAOKhmz|XdC@~$IWWJf00000NkvXX Hu0mjfITyzy