Merge branch 'release/0.11.9.17'

ulmic · Dec 25, 2016 · 6b8302e · 6b8302e
2 parents f190e16 + 6f639d5
commit 6b8302e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -68,7 +68,7 @@ gem 'karamzin'
 gem 'doorkeeper'
 gem 'responders', '~> 2.0'
 gem 'kabal', '>= 1.3'
-gem 'youtube_addy'
+gem 'youtube_rails'
 
 group :production do
   gem 'unicorn-rails'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -476,7 +476,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    youtube_addy (1.0.4)
+    youtube_rails (1.2.1)
 
 PLATFORMS
   ruby
@@ -561,7 +561,7 @@ DEPENDENCIES
   virtus
   web-console (= 2.0.0.beta2)
   webmock
-  youtube_addy
+  youtube_rails
 
 RUBY VERSION
    ruby 2.3.0p0

diff --git a/app/views/web/events/show.html.haml b/app/views/web/events/show.html.haml
@@ -78,7 +78,7 @@
     .row
       .small-9.columns
         .youtube_video
-          != YouTubeAddy.youtube_embed_url(@event.online_conference.video_link)
+          != YouTubeRails.youtube_embed_url(@event.online_conference.video_link, { ssl: true })
   .event-content.container.ask-question
     .row
       .small-6.columns

diff --git a/lib/validators/youtu_dot_be_video_link_validator.rb b/lib/validators/youtu_dot_be_video_link_validator.rb
@@ -1,7 +1,7 @@
 class YoutuDotBeVideoLinkValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     if value.present?
-      unless value =~ /youtu.be/
+      unless value =~ /youtu.be/ && value =~ /https/
         record.errors.add(attribute, :video_link, options.merge(value: value))
       end
     end