AtHeartEngineer/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-09 14:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3-2-15' into 3-2-sec

Browse Source 
* 3-2-15:
  bumping to rc3
  Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"
  Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"
  bumping to rc2
  Merge pull request #12443 from arthurnn/add_inverse_of_add_target
  bumping version to 3.2.15.rc1
  Fix STI scopes using benolee's suggestion. Fixes #11939
This commit is contained in:
Aaron Patterson
2013-10-15 11:15:08 -07:00
parent befeeb2d0a e3abd78ee5
commit eb8807e84d
16 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
actionpack/lib/action_pack/version.rb
View File

@@ -2,8 +2,8 @@ module ActionPack
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
TINY = 14
PRE = nil
TINY = 15
PRE = "rc3"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end