aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* We don't need parenthesis for thisGuillermo Iguaran2014-08-051-1/+1
* Merge pull request #16405 from arthurnn/fix_digest_etag_testGuillermo Iguaran2014-08-051-1/+1
|\
| * Fix digest ETAG test.Arthur Neves2014-08-051-1/+1
|/
* Merge pull request #16404 from bogdan/move-create-with-bangCarlos Antonio da Silva2014-08-052-15/+12
|\
| * Moved #create! method from Validations to Persistence moduleBogdan Gusiev2014-08-052-15/+12
* | Fix AS docs / changelog with wrong method [ci skip]Carlos Antonio da Silva2014-08-052-3/+3
* | Bring back the helpers testsJosé Valim2014-08-053-0/+50
* | Remove unused text? predicate method and delegationCarlos Antonio da Silva2014-08-052-5/+1
* | Call public methods rather than class_eval'ingCarlos Antonio da Silva2014-08-051-4/+2
|/
* avoid testing only_pathAaron Patterson2014-08-042-2/+5
* Merge pull request #16396 from eileencodes/dont-delegate-chain-to-through-ass...Rafael Mendonça França2014-08-041-2/+2
|\
| * Don't delegate Reflection#chain to ThroughAssociationeileencodes2014-08-041-2/+2
|/
* Merge pull request #16395 from jonatack/patch-8Rafael Mendonça França2014-08-041-1/+1
|\
| * Update itself.rb [ci skip]Jon Atack2014-08-051-1/+1
|/
* Merge pull request #16375 from johnnyshields/guidesRichard Schneeman2014-08-041-0/+2
|\
| * [ci skip] Guides: Add definition of `config.assets.manifest` option to config...Johnny Shields2014-08-051-0/+2
* | Only define Objetc#itself when it is not definedRafael Mendonça França2014-08-041-8/+10
* | Merge pull request #16393 from jonatack/patch-8Rafael Mendonça França2014-08-041-1/+1
|\ \
| * | Fix typo [ci skip]Jon Atack2014-08-041-1/+1
|/ /
* | Regenerate sid when sbdy tries to fixate the sessionSantiago Pastorino2014-08-042-12/+11
* | Merge pull request #16333 from joker1007/fix_decimal_cast_from_float_with_lar...Yves Senn2014-08-043-4/+26
|\ \
| * | Fix type casting to Decimal from Float with ...joker10072014-08-013-4/+26
* | | Explain why we use asset digests, not what a setter doesDavid Heinemeier Hansson2014-08-032-2/+4
* | | Add suggestion as to how you can app the the assets load pathDavid Heinemeier Hansson2014-08-031-0/+3
* | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-032-43/+33
|\ \ \
| * \ \ Merge pull request #16386 from JackDanger/journey-no-result-varGuillermo Iguaran2014-08-032-43/+33
| |\ \ \
| | * | | Using no_result_var in Journey's parser generatorJack Danger Canty2014-08-032-43/+33
* | | | | Pull in the custom configuration concept from dhh/custom_configurationDavid Heinemeier Hansson2014-08-035-1/+103
|/ / / /
* | | | A few more tests asserting the presence of helper test stubsDavid Heinemeier Hansson2014-08-036-17/+0
* | | | Update docs to reflect that helper stubs are no longer generatedDavid Heinemeier Hansson2014-08-035-25/+2
* | | | Stubs are no longer generated for helpers, so dont test for itDavid Heinemeier Hansson2014-08-031-4/+0
* | | | Change the production log level default from :info to :debug. All production ...David Heinemeier Hansson2014-08-031-2/+2
* | | | Generating stubs for helper tests is overly specific. Most helpers should sim...David Heinemeier Hansson2014-08-034-75/+0
|/ / /
* | | Merge pull request #16306 from aditya-kapoor/add-docs-for-uglifierZachary Scott2014-08-021-8/+9
|\ \ \
| * | | [ci skip] add tip for uglifier in execjs errorAditya Kapoor2014-08-031-8/+9
* | | | Merge pull request #16380 from y-yagi/patch-1Richard Schneeman2014-08-021-1/+0
|\ \ \ \
| * | | | [ci skip] Remove "Machinist" from testing guideyuuji.yaginuma2014-08-031-1/+0
|/ / / /
* | | | Merge pull request #16378 from JackDanger/doc-fix-in-join-association-build_c...Rafael Mendonça França2014-08-021-1/+1
|\ \ \ \
| * | | | updating documented parameter for build_constraintJack Danger Canty2014-08-021-1/+1
* | | | | Merge pull request #16377 from JackDanger/doc-fix-in-association-reflectionEileen M. Uchitelle2014-08-021-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixes small error in ActiveRecord::Reflection docsJack Danger Canty2014-07-311-1/+1
| |/ / /
* | | | [ci skip] fix markdownschneems2014-08-021-1/+1
* | | | Merge pull request #16374 from rajcybage/consistency_minitestRafael Mendonça França2014-08-022-3/+3
|\ \ \ \
| * | | | rename MiniTest to MinitestRajarshi Das2014-08-022-3/+3
| | |/ / | |/| |
* | | | Merge pull request #16373 from eileencodes/deprecate-reflection-source_macroRafael Mendonça França2014-08-022-1/+15
|\ \ \ \
| * | | | Deprecate source_macroeileencodes2014-08-022-1/+15
|/ / / /
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-08-024-30/+11
|\ \ \ \
| * | | | copy edits[ci skip]Vijay Dev2014-08-021-3/+1
| * | | | [ci skip] Normalize all localhost linking.Juanito Fatas2014-07-201-2/+2
| * | | | Performed Returns true if redirect/render has happenedGaurish Sharma2014-07-191-1/+4