| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #9398 from senny/revert_precompile_config_move | Guillermo Iguaran | 2013-02-24 | 3 | -10/+6 |
| |\ | | | | | Revert "move config.assets.precompile into config/application.rb" | ||||
| | * | Revert "move config.assets.precompile into config/application.rb" | Yves Senn | 2013-02-24 | 3 | -10/+6 |
| |/ | | | | | | | This reverts commit 304f4d4c25ccabdbf97d37dd7a92a54d0b63a9c9. As it turns out everything should behave as it did and we don't need to move this configuration option. | ||||
| * | fix respond_to without blocks not working if one of the blocks is all | grosser | 2013-02-24 | 4 | -1/+25 |
| | | |||||
| * | Merge pull request #9356 from senny/988_multiple_actions_for_after_commit | Steve Klabnik | 2013-02-24 | 3 | -14/+60 |
| |\ | | | | | multiple actions for :on option with `after_commit` and `after_rollback` | ||||
| | * | multiple actions for :on option with `after_commit` and `after_rollback` | Yves Senn | 2013-02-21 | 3 | -14/+60 |
| | | | | | | | | | Closes #988. | ||||
| * | | Merge pull request #9397 from senny/9201_duplicate_associations_with_natural_key | Rafael Mendonça França | 2013-02-24 | 2 | -0/+12 |
| |\ \ | | | | | | | test case to prevent duplicated associations with custom PK. | ||||
| | * | | test case to prevent duplicated associations with custom PK. | Yves Senn | 2013-02-24 | 2 | -0/+12 |
| |/ / | | | | | | | closes #9201 | ||||
| * | | Merge pull request #9395 from yahonda/oracle_index_length | Carlos Antonio da Silva | 2013-02-23 | 1 | -2/+10 |
| |\ \ | | | | | | | Address failure test_rename_column_with_multi_column_index with Oracle | ||||
| | * | | Oracle enhanced adapter shortens its name if it is longer than 30 bytes | Yasuo Honda | 2013-02-24 | 1 | -2/+10 |
| |/ / | | | | | | | because of Oracle database index length spec. | ||||
| * | | Merge pull request #9394 from senny/actually_rename_the_test_case | Rafael Mendonça França | 2013-02-23 | 1 | -1/+1 |
| |\ \ | | | | | | | also rename the test-case class inside columns_test.rb | ||||
| | * | | also rename the test-case class inside columns_test.rb | Yves Senn | 2013-02-24 | 1 | -1/+1 |
| |/ / | |||||
| * | | Revert "prevent minitest from printing a --seed run option" | Xavier Noria | 2013-02-24 | 1 | -12/+2 |
| | | | | | | | | | | | | | | | | | | | Reason: on a second thought, minitest prints a seed as run option regardless of the test order, and it actually calls srand, so albeit it might be misleading I believe, it is the way it is and should be left that way. This reverts commit c15862ae0cb876d745609170f0f90a9bb9b5e0ae. | ||||
| * | | prevent minitest from printing a --seed run option | Xavier Noria | 2013-02-24 | 1 | -2/+12 |
| | | | | | | | | | See the first FIXME comment in the patch for the rationale. | ||||
| * | | registers the encrypted session store in the AP changelog | Xavier Noria | 2013-02-23 | 1 | -0/+4 |
| | | | |||||
| * | | Merge pull request #9393 from rubys/master | Guillermo Iguaran | 2013-02-23 | 1 | -1/+1 |
| |\ \ | | | | | | | guides/rails_guides moved up and out of the railties directory | ||||
| | * | | guides/rails_guides moved up and out of the railties directory | Sam Ruby | 2013-02-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | adds a missing LIMIT 1 in #take docs | Xavier Noria | 2013-02-23 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #9389 from senny/forwardport_9388 | Carlos Antonio da Silva | 2013-02-23 | 1 | -1/+15 |
| |\ \ | | | | | | | Forwardport #9388 rename/remove column preserves custom PK. | ||||
| | * | | rename_column_test.rb -> columns_test.rb to reveal intent. | Yves Senn | 2013-02-23 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | I renamed the test to better communicate it's intention. Since it also tests: - add_column - remove_column - change_column There is no reason to call it rename_column_test. | ||||
| | * | | forwardport #9388 rename/remove column preserves custom PK. | Yves Senn | 2013-02-23 | 1 | -1/+15 |
| |/ / | |||||
| * | | Merge pull request #9387 from boukevanderbijl/master | Carlos Antonio da Silva | 2013-02-23 | 1 | -1/+1 |
| |\ \ | | | | | | | Fix debug helper not inspecting when it can't convert to YAML | ||||
| | * | | Fix debug helper not inspecting on Exception | Bouke van der Bijl | 2013-02-23 | 1 | -1/+1 |
| |/ / | | | | | The debug helper should inspect the object when it can't be converted to YAML, this behavior was changed in 8f8d8eb1465069e2ed9b6f2404aa9d02e785f534. | ||||
| * | | Move number_to_human test from AP to AS | Carlos Antonio da Silva | 2013-02-22 | 2 | -5/+7 |
| | | | | | | | | | | | Since all changes from #9347 are related to AS, it seems proper that the test is placed there as well. | ||||
| * | | Changelog improvements, use 1.9 style hash in examples [ci skip] | Carlos Antonio da Silva | 2013-02-22 | 2 | -14/+13 |
| | | | |||||
| * | | Merge pull request #9347 from hoffm/number_to_human_bug | Steve Klabnik | 2013-02-22 | 3 | -1/+19 |
| |\ \ | | | | | | | Address edge case for number_to_human with units option. | ||||
| | * | | Address edge case for number_to_human with units option. | hoffm | 2013-02-22 | 3 | -1/+19 |
| | | | | | | | | | | | | | | | | | | | ActiveSupport::NumberHelper#number_to_human now returns the number unaltered when the units hash does not contain the needed key, e.g. when the number provided is less than the largest key provided. | ||||
| * | | | Merge pull request #9384 from eval/documentation_of_minute | Carlos Antonio da Silva | 2013-02-22 | 2 | -4/+4 |
| |\ \ \ | | | | | | | | | Correct comment for (beginning|end)_of_minute [ci skip] | ||||
| | * | | | Correct comment for (beginning|end)_of_minute | Gert Goet | 2013-02-22 | 2 | -4/+4 |
| |/ / / | |||||
| * / / | Fix backwards compatibility with Rails 3 apps. | Steve Klabnik | 2013-02-22 | 3 | -40/+52 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we removed script/rails and introduced bin/rails, we accidentally introduced a regression. If you install Rails 4 as a gem, then try to do something in a Rails 3 application: $ rails g This will throw the 'please type rails new foo' message rather than the proper generator documentation message. This is because older apps don't have bin/rails. Therefore, we now *prefer* bin/rails, but still search for script/rails, and exec the one we find. | ||||
| * | | Merge pull request #9334 from NARKOZ/time_tag | Andrew White | 2013-02-21 | 2 | -19/+21 |
| |\ \ | | | | | | | use ISO 8601 format in time_tag helper | ||||
| | * | | document setting custom datetime attribute for time_tag helper | Nihad Abbasov | 2013-02-22 | 1 | -0/+2 |
| | | | | |||||
| | * | | fix time_tag helper and update tests to not rely on dynamically generated values | Nihad Abbasov | 2013-02-22 | 2 | -19/+19 |
| | | | | | | | | | | | | | | | | | | | | | | Before `time_tag Date.today` will return `<time datetime="2013-02-14T00:00:00+00:00">February 14, 2013</time>`. This commit fixes time_tag helper to use RFC-3339 full-date format (Y-m-d) in datetime attribute. | ||||
| * | | | Merge pull request #9365 from gaganawhad/core-ext-beginning-of-minute | Andrew White | 2013-02-21 | 6 | -0/+61 |
| |\ \ \ | | | | | | | | | Added beginning_of_minute support to core_ext calculations for Time and DateTime | ||||
| | * | | | Added beginning_of_minute support to core_ext calculations for Time and DateTime | Gagan Awhad | 2013-02-21 | 6 | -0/+61 |
| | | | | | |||||
| * | | | | completes pass over the AP changelog [ci skip] | Xavier Noria | 2013-02-21 | 2 | -15/+6 |
| | | | | | |||||
| * | | | | tweaks to the AP changelog [ci skip] | Xavier Noria | 2013-02-21 | 1 | -9/+3 |
| | | | | | |||||
| * | | | | Merge pull request #9361 from senny/improved_match_shorthand_syntax | Andrew White | 2013-02-21 | 3 | -14/+53 |
| |\ \ \ \ | |/ / / |/| | | | determine the match shorthand target early. | ||||
| | * | | | determine the match shorthand target early. | Yves Senn | 2013-02-21 | 3 | -14/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #7554. This patch determines the `controller#action` directly in the `match` method when the shorthand syntax is used. this prevents problems with namespaces and scopes. | ||||
| * | | | | Revert "Revert "Merge pull request #4803 from lucascaton/master"" | Santiago Pastorino | 2013-02-21 | 3 | -3/+5 |
| | | | | | | | | | | | | | | | | | This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d. | ||||
| * | | | | This cache is not needed | Santiago Pastorino | 2013-02-21 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Use composition to figure out the forgery protection strategy | Santiago Pastorino | 2013-02-21 | 1 | -9/+27 |
| | | | | | |||||
| * | | | | Use #grep to filter priority zones when a regexp is given | Carlos Antonio da Silva | 2013-02-21 | 2 | -3/+5 |
| | | | | | |||||
| * | | | | Use Array Difference to calculate the zones array, instead of iterating | Carlos Antonio da Silva | 2013-02-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | It's faster, and doesn't force us to dup the timezones array. | ||||
| * | | | | Fix test name and refactor fake timezones creation in form options test | Carlos Antonio da Silva | 2013-02-21 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Remove not necessary changelog about time zone array mutation | Carlos Antonio da Silva | 2013-02-21 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seemed to be introduced in master by 9dd64f2e0c1b3ce85b503b0f81c50c93f89ffbcd, so there's no need to add a changelog entry for fixing it. [ci skip] | ||||
| * | | | | tweaks to the AP changelog [ci skip] | Xavier Noria | 2013-02-21 | 1 | -42/+27 |
| | | | | | |||||
| * | | | | Merge pull request #9358 from iwiznia/patch-1 | Xavier Noria | 2013-02-21 | 1 | -3/+3 |
| |\ \ \ \ | |/ / / |/| | | | Update railties/lib/rails/application/configuration.rb | ||||
| | * | | | Update railties/lib/rails/application/configuration.rb | iwiznia | 2013-02-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | Better comment for database_configuration method | ||||
| | * | | | Update railties/lib/rails/application/configuration.rb | iwiznia | 2013-02-21 | 1 | -1/+1 |
| |/ / / | | | | | | | Changed comment that referenced the property #database_configuration_file, now it's paths["config/database"] | ||||
| * | | | Merge pull request #9354 from NARKOZ/remove-warnings | Steve Klabnik | 2013-02-21 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | remove assigned but unused variables | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |