aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use #model_name on instances instead of classesAmiel Martin2014-06-2413-24/+28
* 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
| * | | | | | Remove unused param 'klass' from AttributeAssignment#read_otherMindaugas Mozūras2014-06-231-2/+2
* | | | | | | Merge pull request #15886 from JuanitoFatas/disable-autolinkZachary Scott2014-06-231-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Disable autolink in example code blocks in guides.Juanito Fatas2014-06-241-0/+6
|/ / / / / / /
* | | | | | | Merge pull request #15882 from aditya-kapoor/remove-unnecessary-requireRafael Mendonça França2014-06-231-1/+0
|\ \ \ \ \ \ \
| * | | | | | | remove unnecessary require for json serialization test casesAditya Kapoor2014-06-241-1/+0
|/ / / / / / /
* | | | | | | Merge pull request #14113 from murb/patch-1Rafael Mendonça França2014-06-231-5/+6
|\ \ \ \ \ \ \
| * | | | | | | Moved explanation of `--mountable` option upMaarten Brouwers2014-02-191-5/+6
* | | | | | | | Merge pull request #15732 from kuldeepaggarwal/correct-assets-ouputRafael Mendonça França2014-06-232-15/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] correct output for asset_helper methodsKuldeep Aggarwal2014-06-162-15/+15
* | | | | | | | | Merge pull request #15878 from sgrif/sg-null-columnRafael Mendonça França2014-06-235-33/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add a deprecation cycle for `NullColumn` from `column_for_attribute`Sean Griffin2014-06-235-33/+18
* | | | | | | | | | Merge pull request #15880 from davetoxa/patch-1Zachary Scott2014-06-234-5/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Small typoAnton Cherepanov2014-06-234-5/+5
|/ / / / / / / / /
* | | | | | | | | Merge pull request #15852 from SyntaxBlitz/masterRafael Mendonça França2014-06-231-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Change double quotes to single quotes in guideTimothy Aveni2014-06-211-1/+1
* | | | | | | | | Merge pull request #15867 from sgrif/sg-rm-column-typesYves Senn2014-06-233-5/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Remove unneeded `@column_types` instance variableSean Griffin2014-06-223-5/+1
* | | | | | | | | changelog entries for #15866 and #15848Yves Senn2014-06-221-0/+11
* | | | | | | | | Merge pull request #15848 from sgrif/sg-remove-deprecationYves Senn2014-06-221-8/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Remove old deprecation warningSean Griffin2014-06-221-8/+1
* | | | | | | | | Merge pull request #15865 from sgrif/sg-missing-testYves Senn2014-06-221-0/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing test cases for `attribute_names` instance methodSean Griffin2014-06-221-0/+20
* | | | | | | | | | Merge pull request #15866 from sgrif/sg-reload-attributesYves Senn2014-06-223-5/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | `reload` should fully reload attributesSean Griffin2014-06-223-5/+8
|/ / / / / / / / /
* | | | | | | | | Merge pull request #15860 from aidanharan/docrails-assets-manifest-typoYves Senn2014-06-221-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |