aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* use polymorphic proxies to remove duplicate codeAaron Patterson2013-09-061-24/+43
|
* reduce duplication somewhatAaron Patterson2013-09-061-14/+14
|
* make the duplicate code more similarAaron Patterson2013-09-061-4/+10
|
* auto link hm:t fixture join tables like habtmAaron Patterson2013-09-062-0/+51
|
* don't depend on object state when reading fixture filesAaron Patterson2013-09-061-8/+7
|
* ensure @model_class is initializedAaron Patterson2013-09-061-0/+1
|
* Fix failure with minitest 5.0.7Carlos Antonio da Silva2013-09-061-0/+1
| | | | | | | | | | | | | Require minitest/mock in test where stub method is needed. Apparently this was being "imported" by minitest pride plugin, which previously required "minitest/autorun", that required "minitest/mock", making the method available by chance. It has been changed in minitest: https://github.com/seattlerb/minitest/commit/595ce955c0d89575726d10fc18d2afd8f334bcbe So we need to make sure we require what we really need where necessary.
* Do not use instance variables if they are not reused elsewhereCarlos Antonio da Silva2013-09-061-2/+1
|
* Merge pull request #12148 from gzohari/callback-typoCarlos Antonio da Silva2013-09-061-1/+1
|\ | | | | Fix typo in set_callback docs. [ci skip]
| * Fix typo in set_callback docs. [ci skip]Gilad Zohari2013-09-061-1/+1
|/
* no need to dupAaron Patterson2013-09-051-1/+1
|
* push logic outside the FixtureSet constructorAaron Patterson2013-09-051-3/+3
|
* only construct the FixtureSet with AR modelsAaron Patterson2013-09-051-2/+11
|
* push constant lookup in the a cache objectAaron Patterson2013-09-051-2/+21
|
* Merge pull request #12143 from rajcybage/fixing_typosCarlos Antonio da Silva2013-09-052-2/+2
|\ | | | | fix actionview and activemodel test cases typos
| * fix actionview and activemodel test cases typosRajarshi Das2013-09-052-2/+2
| |
* | Merge pull request #12139 from vipulnsward/typos_avYves Senn2013-09-052-2/+2
|\ \ | | | | | | Fix method name typos
| * | Fix method name typosVipul A M2013-09-052-2/+2
| | |
* | | Merge pull request #12130 from egilburg/patch-1Yves Senn2013-09-051-2/+33
|\ \ \ | |/ / |/| | Document a difference between pluck and select [ci skip]
| * | Document a difference between pluck and select [ci skip]Eugene Gilburg2013-09-041-2/+33
| | | | | | | | | | | | Explain that `pluck` differs from `select` in that it does not construct `ActiveRecord` objects and thus model-level overrides are unavailable.
* | | Add a test case for exists? with multiple valuesRafael Mendonça França + Kassio Borges2013-09-041-0/+1
| | |
* | | render_to_string shouldn't play with response_bodySantiago Pastorino2013-09-041-4/+5
| | |
* | | Merge pull request #12094 from brocktimus/masterSteve Klabnik2013-09-041-3/+3
|\ \ \ | | | | | | | | Substitute dynamic finders in 4.0 release notes [ci skip]
| * | | Adjusting 4.0 release notes to show more appropriate replacements for ↵Brock Trappitt2013-09-011-3/+3
| | | | | | | | | | | | | | | | dynamic finders [ci skip]
* | | | Merge pull request #12077 from estsauver/doc_fixSteve Klabnik2013-09-041-2/+3
|\ \ \ \ | |_|/ / |/| | | Update mapper documenation for match helper [ci skip]
| * | | Update mapper documenation for match helper [ci skip]Earl St Sauver2013-08-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This piece of documentation is out of date. The use of match without any via option is prevented, now the HTTP verbs have to be explicitly set. If they're not set then the error message in normalize_conditions! (around line 186) is shown.
* | | | Merge pull request #11958 from jetthoughts/extract_pre_process_orders_argsYves Senn2013-09-045-15/+52
|\ \ \ \ | | | | | | | | | | Re-use order arguments pre-processing for reorder
| * | | | Extracted from `order` processing of arguments, and use it for `reorder` to ↵Paul Nikitochkin2013-09-045-15/+52
| | | | | | | | | | | | | | | | | | | | be consistent.
* | | | | adding a hm:t test for singleton ar objectsAaron Patterson2013-09-031-0/+27
| | | | |
* | | | | support anonymous classes on has_many associationsAaron Patterson2013-09-033-1/+20
| | | | |
* | | | | Merge pull request #12065 from SamSaffron/result_optimisationAaron Patterson2013-09-031-1/+15
|\ \ \ \ \ | | | | | | | | | | | | Perf: micro optimised Result column hash_row creation
| * | | | | Perf: micro optimised Result column hash_row creationSam2013-08-291-1/+15
| | | | | |
* | | | | | Merge pull request #12126 from namusyaka/fix-some-typosVijay Dev2013-09-032-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix a few typos.
| * | | | | | Fix a few typos. [ci skip]namusyaka2013-09-042-3/+3
|/ / / / / /
* | | | | | Revert "Merge pull request #12085 from valk/master"Santiago Pastorino2013-09-031-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 15455d76c8d33b3767a61e0cdd2de0ff592098ef, reversing changes made to ffa56f73d5ae98fe0b8b6dd2ca6f0dffac9d9217.
* | | | | | Merge pull request #12121 from strzalek/move-methods-to-abs-controllerRafael Mendonça França2013-09-034-62/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move glue methods & BasicRendering to AbstractController
| * | | | | | Move BasicRendering to AbstractControllerŁukasz Strzałkowski2013-09-033-29/+29
| | | | | | |
| * | | | | | Make Mime::TEXT default format in AbstractControllerŁukasz Strzałkowski2013-09-032-4/+1
| | | | | | |
| * | | | | | Move skeleton methods from AV to AbsCŁukasz Strzałkowski2013-09-032-29/+19
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The methods: * #render_to_body * #render_to_string * #_normalize_render Haven't had anything specyfic to ActionView. This was common code which should belong to AbstractController
* | | | | | Merge pull request #12110 from strzalek/revert-default-protected-instance-varsRafael Mendonça França2013-09-026-25/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | Revert default protected instance vars
| * | | | | | Return to using protected_instance_variables in AVŁukasz Strzałkowski2013-09-022-9/+6
| | | | | | |
| * | | | | | Revert "Port all remaining self.protected_instance_variables to class methods"Łukasz Strzałkowski2013-09-025-21/+19
|/ / / / / / | | | | | | | | | | | | | | | | | | This reverts commit 7de994fa215e9f4c2856d85034bc4dd7b65d0c01.
* | | | | | Merge pull request #12105 from rajcybage/fixing_typoYves Senn2013-09-021-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | fix the typo [ci skip]
| * | | | | fix the typo [ci skip]Rajarshi Das2013-09-021-1/+1
| | | | | | | | | | | | | | | | | | fix the typo newstopics => new topics in action view cache helper
* | | | | | Remove useless comment and white spaces :scissors: [ci skip]Carlos Antonio da Silva2013-09-012-3/+2
| | | | | |
* | | | | | Reuse variable to avoid symbol usageCarlos Antonio da Silva2013-08-311-2/+2
| | | | | |
* | | | | | Merge pull request #12097 from kassio/remove-unused-delegate-on-railtieJosé Valim2013-08-311-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unused delegate
| * | | | | | Remove unused delegateKassio Borges2013-08-311-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Related with commit 4a2a504
* | | | | | | Merge pull request #11912 from jonkessler/respond-to-signature-fixesRafael Mendonça França2013-08-314-2/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update Rails::Railtie::Configuration and ActionDispatch::Response#respond_to? to accept include_private argument
| * | | | | | | update Rails::Railtie::Configuration and ↵Jon Kessler2013-08-164-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Response#respond_to? to accept include_private argument