| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | Merge pull request #7905 from jfirebaugh/eager_autoload_3-2 | Rafael Mendonça França | 2012-10-10 | 2 | -15/+21 |
|\ \ \ |
|
| * | | | Eager autoload Preloader classes | John Firebaugh | 2012-10-10 | 1 | -10/+14 |
| * | | | Eager autoload ActiveRecord association helpers | Michael Fairley | 2012-10-10 | 1 | -5/+7 |
|/ / / |
|
* | | | Backport 1a7049906ee6735bae058e9985a3806d08d9746b | Jeremy Kemper | 2012-10-06 | 1 | -3/+6 |
* | | | Merge pull request #7865 from teleological/link_to_remote_3_2 | Rafael Mendonça França | 2012-10-06 | 3 | -1/+12 |
|\ \ \ |
|
| * | | | Accept :remote as symbol in link_to options | Riley | 2012-10-06 | 3 | -1/+12 |
* | | | | Use the Ruby 1.8 hash syntax | Rafael Mendonça França | 2012-10-06 | 1 | -1/+1 |
|/ / / |
|
* | | | Merge pull request #7848 from senny/3415_assert_template_has_nil_variable | Rafael Mendonça França | 2012-10-06 | 3 | -3/+23 |
* | | | Merge pull request #7850 from senny/5920_postgres_adapter_table_with_capital_... | Rafael Mendonça França | 2012-10-06 | 3 | -5/+14 |
* | | | Merge pull request #6978 from frodsan/count_nosql_unsaved_parent | Rafael Mendonça França | 2012-10-04 | 5 | -0/+37 |
* | | | Merge pull request #7836 from lihanli/error-msg-update | Rafael Mendonça França | 2012-10-03 | 2 | -2/+6 |
|\ \ \ |
|
| * | | | Update supported ruby versions error message in ruby_version_check.rb | lihan | 2012-10-03 | 2 | -2/+6 |
|/ / / |
|
* | | | Refactor | Santiago Pastorino | 2012-10-03 | 1 | -5/+3 |
* | | | Merge pull request #7822 from lulalala/reset-counter-cache-for-has-many-through | Rafael Mendonça França | 2012-10-02 | 5 | -4/+29 |
* | | | Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables | Rafael Mendonça França | 2012-10-01 | 3 | -23/+29 |
* | | | Merge pull request #7789 from senny/7777_resource_functions_modify_options | Rafael Mendonça França | 2012-10-01 | 3 | -2/+27 |
* | | | Merge pull request #6450 from iHiD/resource_generator_routes_master | Rafael Mendonça França | 2012-10-01 | 3 | -7/+116 |
* | | | Since File instance doesn't respond to #open use a double to test the | Rafael Mendonça França | 2012-09-30 | 3 | -5/+4 |
* | | | Asset manifest includes aliases for foo.js -> foo/index.js and vice versa. Bu... | Jeremy Kemper | 2012-09-30 | 4 | -22/+43 |
* | | | Merge pull request #7802 from steveklabnik/issue_7799 | Xavier Noria | 2012-09-30 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Fix reference to code sample in Getting Started. | Steve Klabnik | 2012-09-30 | 1 | -1/+1 |
|/ / / |
|
* | | | New CHANGELOG entries always in the top [ci skip] | Rafael Mendonça França | 2012-09-30 | 1 | -6/+6 |
* | | | Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased | Rafael Mendonça França | 2012-09-30 | 4 | -6/+55 |
* | | | Merge pull request #7786 from yabawock/3-2-stable | Rafael Mendonça França | 2012-09-29 | 3 | -1/+14 |
|\ \ \ |
|
| * | | | Don't paramify ActionDispatch::Http::UploadedFile in tests | Tim Vandecasteele | 2012-09-29 | 3 | -1/+14 |
* | | | | Merge pull request #7785 from okcwest/3-2-stable | Aaron Patterson | 2012-09-28 | 4 | -6/+13 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | backport 68677ffb8298105eb9d3efa26d928dd88cc5e006 | Evan Petrie | 2012-09-28 | 4 | -6/+13 |
* | | | | Hashrocket for 1.8 support | Jeremy Kemper | 2012-09-28 | 1 | -2/+2 |
* | | | | Shush uninitialized @_layout warning | Jeremy Kemper | 2012-09-28 | 1 | -1/+1 |
|/ / / |
|
* | | | Shush syntax warnings | Jeremy Kemper | 2012-09-28 | 1 | -3/+3 |
* | | | Tune up Rails::Rack::Logger. Only put space between requests in development l... | Jeremy Kemper | 2012-09-27 | 2 | -20/+29 |
* | | | Add logger.push_tags and .pop_tags to complement logger.tagged | Jeremy Kemper | 2012-09-27 | 3 | -18/+69 |
* | | | Log newlines separately to ensure the 'Started GET ...' line has a tag on the... | Jeremy Kemper | 2012-09-27 | 1 | -1/+2 |
* | | | Only apply log tags if the logger supports it | Jeremy Kemper | 2012-09-27 | 1 | -1/+1 |
* | | | Merge pull request #7684 from jrochkind/connection_pool_timeout_key_backport | Rafael Mendonça França | 2012-09-25 | 4 | -5/+39 |
|\ \ \ |
|
| * | | | ConnectionPool accepts spec key 'checkout_timeout' | Jonathan Rochkind | 2012-09-24 | 4 | -5/+39 |
* | | | | Fix invalid ruby 1.8 syntax | Rafael Mendonça França | 2012-09-21 | 1 | -4/+5 |
|/ / / |
|
* | | | Merge pull request #7723 from steveklabnik/backport_3554 | Rafael Mendonça França | 2012-09-21 | 4 | -5/+23 |
|\ \ \ |
|
| * | | | Merge pull request #3544 from amatsuda/_field_changed | Aaron Patterson | 2012-09-21 | 4 | -5/+23 |
|/ / / |
|
* | | | Revert "Revert "Respect `config.digest = false` for `asset_path`"" | Rafael Mendonça França | 2012-09-20 | 3 | -1/+20 |
* | | | Explictly set the assets digest option to false | Rafael Mendonça França | 2012-09-20 | 1 | -2/+5 |
* | | | Revert "Respect `config.digest = false` for `asset_path`" | Rafael Mendonça França | 2012-09-20 | 3 | -20/+1 |
* | | | Revert "backport fair connection pool 02b2335563 to 3-2-stable" | Rafael Mendonça França | 2012-09-20 | 7 | -311/+51 |
* | | | Merge pull request #7718 from kennyj/fix_6962-32 | Rafael Mendonça França | 2012-09-20 | 3 | -1/+16 |
|\ \ \ |
|
| * | | | Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z for... | kennyj | 2012-09-20 | 3 | -1/+16 |
|/ / / |
|
* | | | Load the environment after creating the database | Jeremy Kemper | 2012-09-19 | 1 | -2/+2 |
* | | | Merge pull request #7668 from Draiken/fix_issue_6497 | Rafael Mendonça França | 2012-09-19 | 3 | -1/+18 |
* | | | Cache columns metadata to avoid extra while testing | Rafael Mendonça França | 2012-09-18 | 3 | -1/+11 |
| |/
|/| |
|
* | | Merge pull request #7686 from steveklabnik/add_upgrade_note | Rafael Mendonça França | 2012-09-18 | 1 | -0/+122 |
|\ \ |
|
| * | | Add upgrading note to 3.1 release notes. | Steve Klabnik | 2012-09-18 | 1 | -0/+122 |
|/ / |
|