diff options
| author | Colin Curtin <colin@procore.com> | 2008-11-26 10:18:03 -0800 |
|---|---|---|
| committer | Colin Curtin <colin@procore.com> | 2008-11-26 10:18:03 -0800 |
| commit | 4812e350b9e96641a29c8db6ea153426dad1c9a2 (patch) | |
| tree | 1aa5ab05d8ff420c833677505f9b884ec61e4627 /railties/lib/rails | |
| parent | 78af01f80b3622237462d150aca4aba18204c093 (diff) | |
| parent | d18bfa2a4165297dbf5e6b1fff1731fefa9dd135 (diff) | |
| download | rails-4812e350b9e96641a29c8db6ea153426dad1c9a2.tar.gz rails-4812e350b9e96641a29c8db6ea153426dad1c9a2.tar.bz2 rails-4812e350b9e96641a29c8db6ea153426dad1c9a2.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/vendor_gem_source_index.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/version.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/vendor_gem_source_index.rb b/railties/lib/rails/vendor_gem_source_index.rb index dc821693ac..5b7721f303 100644 --- a/railties/lib/rails/vendor_gem_source_index.rb +++ b/railties/lib/rails/vendor_gem_source_index.rb @@ -81,7 +81,7 @@ module Rails spec.files = files else $stderr.puts("config.gem: Unpacked gem #{dir_name} in vendor/gems not in a versioned directory."+ - " Giving up.") unless @silence_spec_warnings + " Giving up.") unless @@silence_spec_warnings next end end @@ -137,4 +137,4 @@ module Rails end end -end
\ No newline at end of file +end diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index a0986a2e05..bd835fba26 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -2,7 +2,7 @@ module Rails module VERSION #:nodoc: MAJOR = 2 MINOR = 2 - TINY = 0 + TINY = 1 STRING = [MAJOR, MINOR, TINY].join('.') end |