aboutsummaryrefslogtreecommitdiffstats
path: root/railties/builtin
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-04-03 02:38:12 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-04-03 02:38:12 +0000
commit802493ca6d73c5e4fed5a0a47c181dd28d0c475d (patch)
treeb5157bdd2df6c109b87f9718624ea0ab454bfdf6 /railties/builtin
parent484e1c65d8710faeb9f08d33898dc329683b4dab (diff)
downloadrails-802493ca6d73c5e4fed5a0a47c181dd28d0c475d.tar.gz
rails-802493ca6d73c5e4fed5a0a47c181dd28d0c475d.tar.bz2
rails-802493ca6d73c5e4fed5a0a47c181dd28d0c475d.zip
Added TAG option for rake rails:freeze:edge, so you can say rake rails:freeze:edge TAG=rel_1-1-0 to lock to the 1.1.0 release [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4133 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/builtin')
-rw-r--r--railties/builtin/rails_info/rails/info.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/builtin/rails_info/rails/info.rb b/railties/builtin/rails_info/rails/info.rb
index 1bd063896a..29261143e9 100644
--- a/railties/builtin/rails_info/rails/info.rb
+++ b/railties/builtin/rails_info/rails/info.rb
@@ -33,7 +33,11 @@ module Rails
def freeze_edge_version
if File.exists?(rails_vendor_root)
- Dir[File.join(rails_vendor_root, 'REVISION_*')].first.scan(/_(\d+)$/).first.first rescue 'unknown'
+ begin
+ Dir[File.join(rails_vendor_root, 'REVISION_*')].first.scan(/_(\d+)$/).first.first
+ rescue
+ Dir[File.join(rails_vendor_root, 'TAG_*')].first.scan(/_(\w+)$/).first.first rescue 'unknown'
+ end
end
end