aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2519 from vijaydev/readme_fixesXavier Noria2011-08-132-3/+3
|\ | | | | Fixes the README links in README.rdoc on GitHub
| * Fixes readme links better - earlier links broke when the current page is ↵Vijay Dev2011-08-132-3/+3
|/ | | | anything other than github.com/rails/rails/. Even github.com/rails/rails (without the trailing slash) broke the readme links. Also change the rakefile that generates the rdoc readme accordingly
* Perf: don't mess around with thread local vars unless we actually need toJon Leighton2011-08-131-18/+23
|
* Fix default scope thread safety. Thanks @thedarkone for reporting.Jon Leighton2011-08-133-15/+53
|
* Merge pull request #2514 from myronmarston/fix_active_record_observer_disablingJosé Valim2011-08-134-3/+27
|\ | | | | Allow ActiveRecord observers to be disabled.
| * Allow ActiveRecord observers to be disabled.Myron Marston2011-08-124-3/+27
| | | | | | We have to use Observer#update rather than Observer#send since the enabled state is checked in #update before forwarding the method call on.
* | Work around for lolruby bug. (Read on for explanation.)Jon Leighton2011-08-132-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were experiencing CI test failures, for example: * 3-1-stable: http://travis-ci.org/#!/rails/rails/builds/79473/L407 * master: http://travis-ci.org/#!/rails/rails/builds/79507/L80 These failures only happened on 1.8.7-p352, and we were only able to reproduce on the Travis CI VM worker. We even tried creating a new 32 bit Ubuntu VM and running the tests on that, and it all worked fine. After some epic trial and error, we discovered that replacing the following: fuu = Marshal.load(Marshal.dump(fuu)) with: marshalled = Marshal.dump(fuu) fuu = Marshal.load(marshalled) seemed to prevent the failure. We have NO IDEA why this is. If anyone has some great insight to contribute then that is welcome. Otherwise, hopefully this will just help us get the CI green again. Many thanks to @joshk for help with sorting this out.
* | Merge pull request #2516 from arunagw/path_set_fixJon Leighton2011-08-131-0/+4
|\ \ | |/ |/| We need [] method here. previously it's an array.
| * We need [] method here. previously it's an array.Arun Agrawal2011-08-131-0/+4
|/
* moving test_generate to an integration test with one assert per testAaron Patterson2011-08-122-108/+183
|
* Merge pull request #2503 from arunagw/cant_dup_on_nilAaron Patterson2011-08-121-1/+1
|\ | | | | We cannot dup on nil.
| * We actually don't need a reverse_merge! here. dup removed was giving error ↵Arun Agrawal2011-08-121-1/+1
|/ | | | with nil class.
* Merge pull request #2497 from akaspick/url_for_fixSantiago Pastorino2011-08-112-1/+13
|\ | | | | When calling url_for with a hash, additional (likely unwanted) values (such as :host) would be returned in the hash
| * when calling url_for with a hash, additional (likely unwanted) values (such ↵Andrew Kaspick2011-08-112-1/+13
|/ | | | as :host) would be returned in the hash... calling #dup on the hash prevents this
* Merge pull request #2489 from grzuy/masterSantiago Pastorino2011-08-111-4/+4
|\ | | | | Remove parameters_for_url from form_tag method header
| * Remove 'parameters_for_url' parameter from 'form_tag' method signatureGonzalo Rodriguez and Leonardo Capillera2011-08-101-4/+4
|/ | | | | If you use that parameter it will end calling to url_for with two arguments, which fails because url_for expects only one
* add the gem requirement for sqlite3Aaron Patterson2011-08-101-0/+2
|
* Remove lame comment.José Valim2011-08-091-1/+0
|
* rake assets:precompile defaults to production envSantiago Pastorino2011-08-091-0/+1
|
* adding missing require to fist railties testsAaron Patterson2011-08-091-0/+2
|
* Okay, the new incompatible arel is now called 2.2 and the sun shines upon ↵Jon Leighton2011-08-091-1/+1
| | | | thee once more
* Merge pull request #2465 from pivotal-casebook/patch-3Aaron Patterson2011-08-091-0/+2
|\ | | | | Further monkey-patching to avoid deprecation warnings
| * Further monkey-patching to avoid deprecation warningsPivotal Casebook2011-08-081-0/+2
| |
* | deprecating process_view_pathsAaron Patterson2011-08-095-4/+6
| |
* | avoid object creation via useless duping and freezingAaron Patterson2011-08-091-3/+2
| |
* | just use map and case / when rather than modifying the iterating arrayAaron Patterson2011-08-091-5/+8
| |
* | only typecast what we need to typecastAaron Patterson2011-08-091-11/+9
| |
* | Favor composition over inheritance.Aaron Patterson2011-08-091-6/+48
| |
* | Array#+ automatically dups, no double dupingAaron Patterson2011-08-091-2/+2
| |
* | Just remove the sort_locals methodAaron Patterson2011-08-091-12/+1
| |
* | the freeze trick does nothing on arrays used as hash keys.Aaron Patterson2011-08-091-2/+1
| |
* | use functional style to build a list of template objectsAaron Patterson2011-08-091-9/+12
| |
* | refactor the optimized build_query a bitAaron Patterson2011-08-081-8/+3
| |
* | reduce file stats by improving our dir glob patternAaron Patterson2011-08-081-1/+1
| |
* | hash on the template directory in order to improve cache hitsAaron Patterson2011-08-081-2/+3
| |
* | use meaningful names with our variablesAaron Patterson2011-08-081-6/+6
| |
* | use binread to read the filesAaron Patterson2011-08-081-1/+2
| |
* | backporting IO#binread for 1.8 usersAaron Patterson2011-08-082-0/+38
| |
* | be explicit about arguments passed aroundAaron Patterson2011-08-081-2/+2
| |
* | Remove TODO comment I didn't mean to commitJon Leighton2011-08-091-2/+0
| |
* | Bump arel versionJon Leighton2011-08-081-1/+1
| |
* | Fully marshal AR::Base objects. Fixes #2431.Jon Leighton2011-08-082-21/+13
| |
* | Make it the responsibility of the connection to hold onto an ARel visitor ↵Jon Leighton2011-08-0823-68/+122
| | | | | | | | for generating SQL. This improves the code architecture generally, and solves some problems with marshalling. Adapter authors please take note: you now need to define an Adapter.visitor_for method, but it degrades gracefully with a deprecation warning for now.
* | Merge pull request #2426 from pivotal-casebook/fix-buildAaron Patterson2011-08-081-7/+7
|\ \ | | | | | | Make rails gem build directory consistent with actionpack, etc.
| * | Make rails gem build directory consistent with actionpack, etc.Andrew Marshall & Sean Moon2011-08-041-7/+7
| | |
* | | Merge pull request #2466 from rsim/fix_test_disable_referential_integrityAaron Patterson2011-08-081-0/+3
|\ \ \ | |_|/ |/| | Fixed test_disable_referential_integrity on Oracle
| * | Fixed test_disable_referential_integrity on OracleRaimonds Simanovskis2011-08-081-0/+3
|/ / | | | | On Oracle disable_referential_integrity before execution of block will disable foreign key constraints and after block will enable them but when constraints are enabled then they are validated. Therefore created record with invalid foreign key should be deleted before enabling foreign key constraints.
* | Initialize config.assets.version the same way it's done in SprocketsSantiago Pastorino2011-08-082-1/+2
| |
* | Merge pull request #2448 from igrigorik/masterJoshua Peek2011-08-084-2/+16
|\ \ | | | | | | Asset pipeline fixes: clear out tmp cache and use environment in digest generation
| * | use assets.version in asset checksum to allow user to easily overrideIlya Grigorik2011-08-051-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-04 16:20:35 +0000