aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15924 from sgrif/sg-write-unknown-columnRafael Mendonça França2014-06-269-13/+34
|\
| * Move writing unknown column exception to null attributeSean Griffin2014-06-269-13/+34
* | Merge pull request #15916 from sgrif/sg-test-update-allRafael Mendonça França2014-06-264-30/+28
|\ \ | |/ |/|
| * Consolidate testing of update_all type castingSean Griffin2014-06-264-30/+28
* | Merge pull request #15754 from sgrif/sg-deprecate-hmt-counter-cacheRafael Mendonça França2014-06-2616-36/+93
|\ \ | |/ |/|
| * Deprecate automatic counter caches on has_many :throughSean Griffin2014-06-2616-36/+93
|/
* Merge pull request #15870 from sgrif/sg-attribute-nameRafael Mendonça França2014-06-265-44/+64
|\
| * `Attribute` should know about its nameSean Griffin2014-06-265-44/+64
|/
* Merge pull request #15845 from robin850/jruby-isolationRafael Mendonça França2014-06-261-6/+16
|\
| * Make the isolated tests run on JRubyRobin Dupret2014-06-211-6/+16
* | Merge pull request #15834 from rmehner/allow_proc_and_symbol_for_only_integerRafael Mendonça França2014-06-263-1/+32
|\ \
| * | `only_integer` of `NumericalityValidator` now allows procs and symbolsRobin Mehner2014-06-223-1/+32
* | | Require shellwords since it is dependecy of this fileRafael Mendonça França2014-06-261-0/+2
* | | Encapsulate the creation of `Attribute` objectsSean Griffin2014-06-267-19/+92
* | | Merge pull request #15868 from sgrif/sg-uninitialized-attributesRafael Mendonça França2014-06-266-28/+144
|\ \ \
| * | | Move behavior of `read_attribute` to `AttributeSet`Sean Griffin2014-06-256-28/+144
* | | | Merge pull request #15847 from sgrif/sg-encapsulate-result-typesRafael Mendonça França2014-06-265-28/+59
|\ \ \ \
| * | | | Encapsulate knowledge of type objects on `ActiveRecord::Result`Sean Griffin2014-06-225-28/+59
* | | | | Merge pull request #15846 from sgrif/sg-attributes-before-type-castRafael Mendonça França2014-06-263-2/+13
|\ \ \ \ \
| * | | | | Move `attributes_before_type_cast` to `AttributeSet`Sean Griffin2014-06-213-2/+13
| | |_|_|/ | |/| | |
* | | | | docs, fix BacktraceCleaner code example. Closes #15911. [ci skip]Yves Senn2014-06-251-1/+1
* | | | | sync deprecations and removals with 4.2 release notes. [ci skip]Yves Senn2014-06-251-0/+26
* | | | | synchronize Active Record deprecations / removals with 4.2 release notesYves Senn2014-06-252-2/+25
* | | | | `preload` preserves readonly flag on associations. #15853Yves Senn2014-06-253-0/+39
* | | | | Merge pull request #15902 from yuki24/fix-name-error-bugRafael Mendonça França2014-06-242-5/+5
|\ \ \ \ \
| * | | | | Fix a bug where NameError#name returns a qualified name in stringYuki Nishijima2014-06-242-5/+5
* | | | | | Merge pull request #15836 from DNNX/router-swap-select-sortRafael Mendonça França2014-06-241-1/+2
|\ \ \ \ \ \
| * | | | | | Replace x.sort_by!.select! with x.select!.sort_by!Viktar Basharymau2014-06-201-1/+2
* | | | | | | Merge pull request #15885 from lucasmazza/lm-skip-routesRafael Mendonça França2014-06-242-2/+13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add a '--skip-routes' flag for the Controller generator.Lucas Mazza2014-06-242-2/+13
* | | | | | | Merge pull request #15899 from garethrees/gr-texthelperRafael Mendonça França2014-06-242-6/+6
|\ \ \ \ \ \ \
| * | | | | | | Deal with regex match groups in excerptGareth Rees2014-06-242-6/+6
* | | | | | | | Merge pull request #15887 from RudyOnRails/patch-1Arthur Nogueira Neves2014-06-241-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Improves readability...Kevin Musiorski2014-06-241-3/+3
* | | | | | | | Merge pull request #15828 from yuki24/add-warning-about-rescue-from-exceptionSean Griffin2014-06-241-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add warning for `rescue_from Exception` and `rescue_from StandardError`Yuki Nishijima2014-06-191-0/+2
* | | | | | | | | Doc pass for `Type::Value` [ci skip]Sean Griffin2014-06-242-23/+43
* | | | | | | | | Merge pull request #15895 from sgrif/sg-numeric-changesYves Senn2014-06-243-3/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Always assume strings with non-numeric characters change numeric typesSean Griffin2014-06-243-3/+35
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #15894 from sgrif/sg-silence-warning-in-testYves Senn2014-06-242-7/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Silence warning in testSean Griffin2014-06-242-7/+7
|/ / / / / / / /
* | | | | | | | `:nodoc: all` does not remove the constants from the API. [ci skip]Yves Senn2014-06-242-3/+3
* | | | | | | | add missing `:nodoc:` to `store.rb`. [ci skip]Yves Senn2014-06-241-4/+4
* | | | | | | | Merge pull request #15871 from yuki24/add-model-name-instance-methodDavid Heinemeier Hansson2014-06-242-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Delegate #model_name method to self.classYuki Nishijima2014-06-222-0/+12
* | | | | | | | | add missing `:nodoc:` for recent refactorings. [ci skip]Yves Senn2014-06-2431-36/+35
* | | | | | | | | Merge pull request #15810 from maurogeorge/guides-rails-updateYves Senn2014-06-241-0/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add rails:update to the upgrading guidesMauro George2014-06-191-0/+23
* | | | | | | | | | Merge pull request #15881 from mmozuras/remove_unused_paramsRafael Mendonça França2014-06-232-5/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove unused param 'conn' from ConnectionPool#releaseMindaugas Mozūras2014-06-231-3/+3