aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/rails/rails into performance_testGonçalo Silva2011-04-17323-5204/+4286
|\
| * Lazily load sprockets.José Valim2011-04-171-46/+45
| * Fix assets generators.José Valim2011-04-172-16/+11
| * Make generators more modular, add hooks and improve test suite.José Valim2011-04-1711-85/+114
| * Move app initializers to sprockets railtie.José Valim2011-04-173-25/+33
| * Move controller configs to sprockets own railtie.José Valim2011-04-172-1/+10
| * Generate app/* stubs directories for full plugins to show ththat it is possib...José Valim2011-04-173-16/+33
| * Fix plugin new generator to work with new javascript/stylesheets conventionsPiotr Sarnacki2011-04-163-29/+40
| * Updating mail to 2.2.16Mikel Lindsaar2011-04-161-1/+1
| * Fix CI test on 1.8José Valim2011-04-161-1/+4
| * Class docs.José Valim2011-04-161-0/+47
| * Docs.José Valim2011-04-162-11/+10
| * content_for should work with provide.José Valim2011-04-168-10/+43
| * Add more tests, ensure we never yield outside the fiber context and that we s...José Valim2011-04-163-3/+18
| * Basic tests for streaming. Basic tests for provide.José Valim2011-04-164-4/+71
| * The magic medicine worked.José Valim2011-04-162-8/+14
| * Yo dawg, I heard you like streaming. So I put a fiber, inside a block, inside...José Valim2011-04-1613-111/+235
| * Buffer should be an option passed down to template rendering.José Valim2011-04-165-100/+5
| * Initial work on fibered layout.José Valim2011-04-169-19/+137
| * switch to using comments to comment thingsAaron Patterson2011-04-151-2/+1
| * Fix generator tests.José Valim2011-04-151-22/+21
| * Fix missing test_helper.José Valim2011-04-152-1/+2
| * render :once, YAGNI.José Valim2011-04-154-119/+1
| * Make static faster as we don't have to serve multiple paths anymore.José Valim2011-04-154-84/+17
| * Remove the ability for engines to serve assets from the public directory.José Valim2011-04-1511-429/+19
| * Fix tests.José Valim2011-04-154-17/+30
| * Booya, sprockets now works from Engines.José Valim2011-04-157-41/+32
| * Add some very simple docs.José Valim2011-04-151-0/+3
| * Remove rescue as it was clobbering the real error.José Valim2011-04-151-31/+8
| * Merge branch 'master' of github.com:rails/railsJon Leighton2011-04-151-3/+4
| |\
| | * attribute should be attributesJosé Valim2011-04-141-1/+1
| | * Edited actionpack/lib/action_view/helpers/form_helper.rb via GitHubJosé Valim2011-04-141-2/+3
| * | Return nil from read_attribute(:foo) if 'foo' is not present in the @attribut...Jon Leighton2011-04-152-2/+3
| * | Undo performances regressions I introduced in bbe0a507f287c20ab4ae8a244fbfc81...Jon Leighton2011-04-152-5/+34
| |/
| * Refactor test to avoid hackeryJon Leighton2011-04-151-4/+4
| * Remove unnecessary code from define_read_method and add assertion to make sur...Jon Leighton2011-04-152-7/+5
| * Use JS comments, pleaseDavid Heinemeier Hansson2011-04-151-9/+9
| * bcrypt will encrypt anything, so validate_presence_of would not catch nil / b...Aaron Patterson2011-04-142-1/+15
| * sort insert columns for better cache hitsAaron Patterson2011-04-141-1/+1
| * generated session ids should be encoded as UTF-8Aaron Patterson2011-04-141-1/+3
| * refactoring inserts to use the same method on the connectionAaron Patterson2011-04-141-21/+16
| * mimic prepared statements in the exec_insert for mysql2Aaron Patterson2011-04-141-0/+11
| * mysql type cast should return integers when typecasting true / falseAaron Patterson2011-04-143-0/+57
| * using the database adapter to typecast before executing prepared statementAaron Patterson2011-04-144-2/+34
| * inserting big decimals as strings works consistently among dbs, so use string...Aaron Patterson2011-04-142-2/+2
| * insert statements are prepared, but values are not escaped properlyAaron Patterson2011-04-145-8/+64
| * adding a type cast method for prepared statementsAaron Patterson2011-04-143-1/+130
| * Extract the constraint-building for joins in JoinAssociation into a separate ...Jon Leighton2011-04-141-8/+14
| * Only rescue a thrown NoMethodError, don't preemptively check for #include?; a...Jared McFarland2011-04-152-1/+8
| * added an exception to Object#in? to match the methods documentationJared McFarland2011-04-151-0/+1