Merge branch 'master' of https://github.com/r888888888/danbooru

app/helpers/posts_helper.rb

@@ -26,7 +26,7 @@ module PostsHelper
       text = "pixiv/#{$1}"
       source_link = link_to(text, post.normalized_source)
       source_search = "source:#{text}/"
-    elsif post.source =~ /^http/
+    elsif post.source =~ %r{\Ahttps?://}
       text = truncate(post.normalized_source.sub(/^https?:\/\/(?:www\.)?/, ""))
       source_link = link_to(truncate(text, :length => 20), post.normalized_source)
       source_search = "source:#{post.source.sub(/[^\/]*$/, "")}"

app/views/posts/index.atom.erb

@@ -14,7 +14,7 @@
     <entry>
       <title><%= post.presenter.humanized_essential_tag_string %></title>
       <link href="http://<%= Danbooru.config.hostname %>/posts/<%= post.id %>" rel="alternate"/>
-      <% if post.source =~ /^http/ %>
+      <% if post.source =~ %r{\Ahttps?://} %>
         <link href="<%= post.source %>" rel="related"/>
       <% end %>
       <id>http://<%= Danbooru.config.hostname %>/posts/<%= post.id %></id>

config/danbooru_default_config.rb

@@ -4,7 +4,7 @@ module Danbooru
   class Configuration
     # The version of this Danbooru.
     def version
-      "2.28.2"
+      "2.29.0"
     end
 
     # The name of this Danbooru.