aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | clear all connections before forkingAaron Patterson2013-08-311-0/+3
| |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Revert "Do not dup the binds when visiting the AST"Rafael Mendonça França + Kassio Borges2013-08-313-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 71ff7d9c6592b93e2c810a1f464943dd7bd02c7f. Reason: I need to check with @jeremy if we can do this.
* | | | | | | | | | | | | | | | | | | | Don't need to check if the scope respond to callRafael Mendonça França + Kassio Borges2013-08-313-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are checking this when defining the default scope and raising an ArgumentError
* | | | | | | | | | | | | | | | | | | | Revert "reconnect after the fork returns"Rafael Mendonça França2013-08-311-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit baf5f47b8768c7ec0164ed5ab60e369cdd936d71. Reason: This is breaking the sqlite3 tests with a missing transacion. Could not investigate right now. cc @tenderlove
* | | | | | | | | | | | | | | | | | | | Do not dup the binds when visiting the ASTRafael Mendonça França2013-08-313-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The visitor have to consume the bind parameters to make the statements work when the prepared statement option is disabled. Fixes #12023
* | | | | | | | | | | | | | | | | | | | Merge pull request #12095 from kassio/upgrade-jruby-gemsRafael Mendonça França2013-08-311-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | Upgrade jruby dependencies
| * | | | | | | | | | | | | | | | | | | upgrade jruby dependenciesKassio Borges2013-08-311-6/+6
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #12091 from rywall/pluck-optimizationJosé Valim2013-08-311-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Perf] Don't use Enumerable#next in pluck since it is very slow
| * | | | | | | | | | | | | | | | | | | Don't use Enumerable#next in pluck since it is very slowRyan Wallace2013-08-301-2/+1
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #12093 from wangjohn/indentation_in_generatorJosé Valim2013-08-311-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | Using indent method to refactor controller generator.
| * | | | | | | | | | | | | | | | | | | Using indent method to refactor controller generator.wangjohn2013-08-311-3/+3
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [John J. Wang & Prathamesh Sonpatki]
* | | | | | | | | | | | | | | | | | | Merge pull request #12090 from njakobsen/merger-performanceAaron Patterson2013-08-301-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Performance] Don't create fibers while merging bind variables
| * | | | | | | | | | | | | | | | | | | Don't create fibers just to iterateNicholas Jakobsen2013-08-301-3/+3
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | reconnect after the fork returnsAaron Patterson2013-08-301-0/+2
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | reduce relation allocationsAaron Patterson2013-08-301-1/+3
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | remove unused variableAaron Patterson2013-08-301-1/+1
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | no need to fully qualifyAaron Patterson2013-08-301-1/+1
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | move the cache to the AR models and populate it on inheritedAaron Patterson2013-08-303-24/+50
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | add a failing test for marshal + cache problemsAaron Patterson2013-08-301-0/+26
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | no need for the const_get since we lockAaron Patterson2013-08-301-5/+1
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | require a class for cache computationsAaron Patterson2013-08-302-2/+4
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | cache misses should return selfAaron Patterson2013-08-301-1/+1
| |_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-08-314-12/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix typos [ci skip]Carlos Antonio da Silva2013-08-301-2/+2
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add documentation for rake db:setup taskJay Hayes2013-08-291-0/+5
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Note functional equivalence in reset taskJay Hayes2013-08-291-2/+2
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix doc for singularize - `pluralized` => `singularized`Vipul A M2013-08-271-1/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Document ability to run a single test.wangjohn2013-08-211-1/+8
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Removing merge conflict remnants in the guides.wangjohn2013-08-211-6/+0
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Moved "`mod_expires` to be enabled" to new line.Prathamesh Sonpatki2013-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Right now the comment was not rendering properly. # The Expires* directives requires the Apache module `mod_expires` to be # enabled. - After this change - # The Expires* directives requires the Apache module # `mod_expires` to be enabled.
* | | | | | | | | | | | | | | | | | | Merge pull request #12085 from valk/masterSantiago Pastorino2013-08-301-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FIX reload! within rails console --sandbox causes undefined method rollb...
| * | | | | | | | | | | | | | | | | | | FIX reload! within rails console --sandbox causes undefined method rollback ↵Val Kotlarov Hoffman2013-08-301-1/+3
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upon exiting [https://github.com/rails/rails/issues/11834]
* / | | | | | | | | | | | | | | | | | add missing fixtures fileAaron Patterson2013-08-301-1/+2
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #12078 from prathamesh-sonpatki/typoGuillermo Iguaran2013-08-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Fix typo in generators test helpr -> helper [ci skip]
| * | | | | | | | | | | | | | | | | Fix typo in generators test helpr -> helper [ci skip]Prathamesh Sonpatki2013-08-301-1/+1
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #12076 from dabit/masterCarlos Antonio da Silva2013-08-293-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken link to Fixtures documentation on guides and activerecord tests [ci skip]
| * | | | | | | | | | | | | | | | | Fix broken link to Fixtures documentation on guidesDavid Padilla2013-08-293-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and activerecord tests [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 16:45:58 +0000