diff options
| -rw-r--r-- | .ruby-version | 1 | ||||
| -rw-r--r-- | .themes/classic/source/_includes/article.html | 3 | ||||
| -rw-r--r-- | .themes/classic/source/_includes/disqus.html | 2 | ||||
| -rw-r--r-- | README.markdown | 1 | ||||
| -rw-r--r-- | Rakefile | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index 77fee73a..00000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -1.9.3 diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html index 23f48844..84279977 100644 --- a/.themes/classic/source/_includes/article.html +++ b/.themes/classic/source/_includes/article.html @@ -9,7 +9,8 @@ <p class="meta"> {% include post/date.html %}{{ time }} {% if site.disqus_short_name and page.comments != false and post.comments != false and site.disqus_show_comment_count == true %} - | <a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread">Comments</a> + | <a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread" + data-disqus-identifier="{% if post.meta.disqus_id %}{{ post.meta.disqus_id }}{% else %}{{ site.url }}{{ post.url }}{% endif %}">Comments</a> {% endif %} </p> {% endunless %} diff --git a/.themes/classic/source/_includes/disqus.html b/.themes/classic/source/_includes/disqus.html index eb308779..549ba3d7 100644 --- a/.themes/classic/source/_includes/disqus.html +++ b/.themes/classic/source/_includes/disqus.html @@ -14,7 +14,7 @@ {% endif %} (function () { var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; - dsq.src = 'http://' + disqus_shortname + '.disqus.com/' + disqus_script; + dsq.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + disqus_shortname + '.disqus.com/' + disqus_script; (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); }()); </script> diff --git a/README.markdown b/README.markdown index 95b3843f..eea8624e 100644 --- a/README.markdown +++ b/README.markdown @@ -8,6 +8,7 @@ Octopress is [Jekyll](https://github.com/mojombo/jekyll) blogging at its finest. 4. **It's easy to use.** A collection of rake tasks simplifies development and makes deploying a cinch. 5. **Ships with great plug-ins** some original and others from the Jekyll community — tested and improved. +**Note**: Octopress requires a minimum Ruby version of `1.9.3-p0`. ## Documentation @@ -307,7 +307,7 @@ task :setup_github_pages, :repo do |t, args| repo_url = args.repo else puts "Enter the read/write url for your repository" - puts "(For example, 'git@github.com:your_username/your_username.github.io)" + puts "(For example, 'git@github.com:your_username/your_username.github.io.git)" puts " or 'https://github.com/your_username/your_username.github.io')" repo_url = get_stdin("Repository url: ") end |