aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-09-08 01:27:24 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2011-09-08 01:27:24 +0530
commit82de8ad9c140afa81d334780e96428ef10ce52e8 (patch)
treed0d6a2647bba24821f8e8eded1fdafdd24c8614b
parentb9f66f4db157eb6c85e1c72d9b1d577cd93cf9de (diff)
downloadrails-82de8ad9c140afa81d334780e96428ef10ce52e8.tar.gz
rails-82de8ad9c140afa81d334780e96428ef10ce52e8.tar.bz2
rails-82de8ad9c140afa81d334780e96428ef10ce52e8.zip
Use Travis https build status image in order to prevent GitHub from
caching the http version. The syntax for including an https image url in RDoc taken from http://about.travis-ci.org/docs/user/status-images. Having this in a line of its own now to make regex replacement for the API simpler!
-rw-r--r--README.rdoc5
-rwxr-xr-xRakefile3
2 files changed, 5 insertions, 3 deletions
diff --git a/README.rdoc b/README.rdoc
index 9f017cd05f..ac43962d97 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -61,13 +61,14 @@ can read more about Action Pack in its {README}[link:/rails/rails/blob/master/ac
* The {Ruby on Rails Guides}[http://guides.rubyonrails.org].
* The {API Documentation}[http://api.rubyonrails.org].
-
-== Contributing http://travis-ci.org/rails/rails.png
+== Contributing
We encourage you to contribute to Ruby on Rails! Please check out the {Contributing to Rails
guide}[http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html] for guidelines about how
to proceed. {Join us}[http://contributors.rubyonrails.org]!
+== Travis Build Status {<img src="https://secure.travis-ci.org/rails/rails.png"/>}[https://secure.travis-ci.org/rails/rails.png]
+
== License
Ruby on Rails is released under the MIT license.
diff --git a/Rakefile b/Rakefile
index f171949961..a47d415abc 100755
--- a/Rakefile
+++ b/Rakefile
@@ -78,7 +78,8 @@ RDoc::Task.new do |rdoc|
rdoc_main.gsub!(%r{link:/rails/rails/blob/master/(\w+)/README\.rdoc}, "link:files/\\1/README_rdoc.html")
# Remove Travis build status image from API pages. Only GitHub README page gets this image
- rdoc_main.gsub!("http://travis-ci.org/rails/rails.png", "")
+ # https build image is used to avoid GitHub caching: http://about.travis-ci.org/docs/user/status-images
+ rdoc_main.gsub!(%r{^== Travis.*}, '')
File.open(RDOC_MAIN, 'w') do |f|
f.write(rdoc_main)