[whimsy] branch master updated: switch to a secure link

[ru...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 4f07e45  switch to a secure link
4f07e45 is described below

commit 4f07e45f65c847e97fd52b1d7eb149a9599b3675
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Fri Jun 30 21:35:48 2017 -0400

    switch to a secure link
---
 www/test/icla/Gemfile           | 12 +++++++++++-
 www/test/icla/views/app.html.rb |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/www/test/icla/Gemfile b/www/test/icla/Gemfile
index bf32cd5..9956405 100644
--- a/www/test/icla/Gemfile
+++ b/www/test/icla/Gemfile
@@ -1,12 +1,22 @@
 source 'https://rubygems.org'
 
+root = '../../../..'
+version_file = File.expand_path("#{root}/asf.version", __FILE__)
+if File.exist? version_file
+  # for deployment and local testing
+  asf_version = File.read(version_file).chomp
+  gem 'whimsy-asf', asf_version, path: File.expand_path(root, __FILE__)
+else
+  # for docker purposes (atleast for now)
+  gem 'whimsy-asf'
+end
+
 gem 'rake'
 gem 'wunderbar', '>= 1.0.0'
 gem 'ruby2js', '>= 2.0.0'
 gem 'sinatra'
 gem 'nokogumbo'
 gem 'execjs', ('<2.5.1' if RUBY_VERSION =~ /^1/)
-gem 'whimsy-asf', '>= 0.0.14'
 
 group :test do
   gem 'rspec'
diff --git a/www/test/icla/views/app.html.rb b/www/test/icla/views/app.html.rb
index 9ecb06b..2dcca6a 100755
--- a/www/test/icla/views/app.html.rb
+++ b/www/test/icla/views/app.html.rb
@@ -8,7 +8,7 @@ _html lang: 'en', _width: '80' do
     _link rel: 'shortcut icon',
       href: 'https://whimsy.apache.org/favicon.ico'
     _title 'ASF ICLA demo'
-    _link href: 'http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700%7cDroid+Serif:400,700',
+    _link href: 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700%7cDroid+Serif:400,700',
       rel: 'stylesheet', type: 'text/css'
     _link href: 'https://www.apache.org/css/min.bootstrap.css',
       rel: 'stylesheet'

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].