aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused text? predicate method and delegationCarlos Antonio da Silva2014-08-052-5/+1
| | | | | | | | The method has been removed in 09206716f8695f6b8467f15c1befa5a4c3c10978 (PR #16074), but the delegation was apparently missed, and one instance of the method was added back with the addition of OID::Xml in 336be2bdf7dfa1b31879d0ab27e5f3101b351923 (PR #16072), so we can safely rm both.
* Call public methods rather than class_eval'ingCarlos Antonio da Silva2014-08-051-4/+2
|
* avoid testing only_pathAaron Patterson2014-08-042-2/+5
| | | | | we know that this call only wants the path returned, so lets call a method that returns the path.
* Merge pull request #16396 from ↵Rafael Mendonça França2014-08-041-2/+2
|\ | | | | | | | | eileencodes/dont-delegate-chain-to-through-association Don't delegate Reflection#chain to ThroughAssociation
| * Don't delegate Reflection#chain to ThroughAssociationeileencodes2014-08-041-2/+2
|/ | | | | | We shouldn't be delegating chain to ThroughAssociation since the only place that needs to call it is `target_scope`. Instead we can call `reflecion.chain`.
* Merge pull request #16395 from jonatack/patch-8Rafael Mendonça França2014-08-041-1/+1
|\ | | | | Update itself.rb [ci skip]
| * Update itself.rb [ci skip]Jon Atack2014-08-051-1/+1
|/
* Merge pull request #16375 from johnnyshields/guidesRichard Schneeman2014-08-041-0/+2
|\ | | | | Guides: Add definition of `config.assets.manifest` option to configuring.md
| * [ci skip] Guides: Add definition of `config.assets.manifest` option to ↵Johnny Shields2014-08-051-0/+2
| | | | | | | | configuring.md
* | Only define Objetc#itself when it is not definedRafael Mendonça França2014-08-041-8/+10
| | | | | | | | | | | | | | Ruby 2.2 will include Kernel#itself so we don't need to define again. See https://github.com/ruby/ruby/commit/0a0160d6b659f6131a525fe1579e7c463d4c197e
* | Merge pull request #16393 from jonatack/patch-8Rafael Mendonça França2014-08-041-1/+1
|\ \ | | | | | | Fix typo [ci skip]
| * | Fix typo [ci skip]Jon Atack2014-08-041-1/+1
|/ /
* | Regenerate sid when sbdy tries to fixate the sessionSantiago Pastorino2014-08-042-12/+11
| | | | | | | | | | | | Fixed broken test. Thanks Stephen Richards for reporting.
* | Merge pull request #16333 from ↵Yves Senn2014-08-043-4/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | joker1007/fix_decimal_cast_from_float_with_large_precision Fix type casting to Decimal from Float with large precision Conflicts: activerecord/CHANGELOG.md
| * | Fix type casting to Decimal from Float with ...joker10072014-08-013-4/+26
| | | | | | | | | | | | | | | When I defines large precision column at RDBMS, I assigns float value, raise ArgumentError (precision too large).
* | | 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 generator
| | * | | Using no_result_var in Journey's parser generatorJack Danger Canty2014-08-032-43/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the generated parser had an intermediate local variable `result` that really useful if you're building up a stateful object but Journey always discards the result argument to the reduce functions. This produces a simpler parser for anybody who actually wants to read the thing. Sadly, there's no real performance speedup with this change.
* | | | | 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
| | | | | | | | | | | | | | | | apps I have ever worked with has done this. Let us reflect that default. You often want those SQL quieries to be able to debug issues in production
* | | | Generating stubs for helper tests is overly specific. Most helpers should ↵David Heinemeier Hansson2014-08-034-75/+0
|/ / / | | | | | | | | | simply be tested as part of the view thats using them. If you need something beyond that, you can add a test yourself for them
* | | Merge pull request #16306 from aditya-kapoor/add-docs-for-uglifierZachary Scott2014-08-021-8/+9
|\ \ \ | | | | | | | | [ci skip] add tip for uglifier in execjs error
| * | | [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 guide
| * | | | [ci skip] Remove "Machinist" from testing guideyuuji.yaginuma2014-08-031-1/+0
|/ / / /
* | | | Merge pull request #16378 from ↵Rafael Mendonça França2014-08-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | JackDanger/doc-fix-in-join-association-build_constraint [doc] updating documented parameter for build_constraint
| * | | | updating documented parameter for build_constraintJack Danger Canty2014-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Updates documentation in line with changes made in 743b67508e2027e1d086142ccbec47a19fc943f6
* | | | | Merge pull request #16377 from JackDanger/doc-fix-in-association-reflectionEileen M. Uchitelle2014-08-021-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fixes small error in ActiveRecord::Reflection docs
| * | | | Fixes small error in ActiveRecord::Reflection docsJack Danger Canty2014-07-311-1/+1
| |/ / / | | | | | | | | | | | | [ci skip]
* | | | [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 Minitest
| * | | | 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_macro
| * | | | Deprecate source_macroeileencodes2014-08-022-1/+15
|/ / / / | | | | | | | | | | | | | | | | | | | | `source_macro` is no longer used in any ActiveRecord code. I've chosen to deprecate it because it was not marked as nodoc and may be in use outside of rails source.
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-08-024-30/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/testing.md
| * | | | 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
| | | | |
| * | | | [ci skip] Remove duplicated last! section.Juanito Fatas2014-07-161-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference: https://github.com/rails/rails/commit/d4fd0bd17709735ac91e434c94fe99429f078c6e cc @schneems
| * | | | [ci skip] Use appropriate mailer syntax.Juanito Fatas2014-07-161-3/+3
| | | | | | | | | | | | | | | | | | | | Reference: https://github.com/rails/rails/commit/f7e4362011ceb1317fd401125d48d7ccb9a1079c
| * | | | Add link to minitest rdoc & githubGaurish Sharma2014-07-131-1/+3
| | | | |
* | | | | just set the host, no need for another hash allocation / merge!Aaron Patterson2014-08-011-1/+1
| | | | |
* | | | | always return a string from find_script_nameAaron Patterson2014-08-012-7/+9
| | | | | | | | | | | | | | | | | | | | this allows us to avoid nil checks on the return value
* | | | | Rename tests tooRafael Mendonça França2014-08-011-2/+2
| | | | |
* | | | | Rename Object#self to Object#itself to have parity with matz sanctioned ↵David Heinemeier Hansson2014-08-014-6/+6
| | | | | | | | | | | | | | | | | | | | method name for Ruby 2.2