| Commit message (Expand) | Author | Age | Files | Lines |
* | guides/rails_guides moved up and out of the railties directory | Sam Ruby | 2013-02-23 | 1 | -1/+1 |
* | Merge pull request #9389 from senny/forwardport_9388 | Carlos Antonio da Silva | 2013-02-23 | 1 | -1/+15 |
|\ |
|
| * | rename_column_test.rb -> columns_test.rb to reveal intent. | Yves Senn | 2013-02-23 | 1 | -0/+0 |
| * | 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 on Exception | Bouke van der Bijl | 2013-02-23 | 1 | -1/+1 |
|/ |
|
* | Move number_to_human test from AP to AS | Carlos Antonio da Silva | 2013-02-22 | 2 | -5/+7 |
* | 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. | hoffm | 2013-02-22 | 3 | -1/+19 |
* | | 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 | Gert Goet | 2013-02-22 | 2 | -4/+4 |
|/ / |
|
* / | Fix backwards compatibility with Rails 3 apps. | Steve Klabnik | 2013-02-22 | 3 | -40/+52 |
|/ |
|
* | Merge pull request #9334 from NARKOZ/time_tag | Andrew White | 2013-02-21 | 2 | -19/+21 |
|\ |
|
| * | 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 |
* | | 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 | 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. | Yves Senn | 2013-02-21 | 3 | -14/+53 |
* | | | Revert "Revert "Merge pull request #4803 from lucascaton/master"" | Santiago Pastorino | 2013-02-21 | 3 | -3/+5 |
* | | | 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 |
* | | | 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 |
* | | | 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 | iwiznia | 2013-02-21 | 1 | -3/+3 |
| * | | Update railties/lib/rails/application/configuration.rb | iwiznia | 2013-02-21 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #9354 from NARKOZ/remove-warnings | Steve Klabnik | 2013-02-21 | 1 | -2/+2 |
|\ \ |
|
| * | | remove assigned but unused variable warning | Nihad Abbasov | 2013-02-21 | 1 | -2/+2 |
* | | | Merge pull request #9357 from fabiokr/rack_test_uploaded_file | Xavier Noria | 2013-02-21 | 2 | -4/+6 |
|\ \ \
| |/ /
|/| | |
|
| * | | Rack::Test::UploadedFile is a permitted scalar | Fabio Kreusch | 2013-02-21 | 2 | -4/+6 |
|/ / |
|
* | | Merge pull request #9348 from schuetzm/doc_no_indices_with_create_join_table | Xavier Noria | 2013-02-21 | 2 | -0/+18 |
|\ \ |
|
| * | | Indent comment block by two spaces. | Marc Schütz | 2013-02-21 | 1 | -4/+4 |
| * | | Add more documentation for create_join_table. | Marc Schütz | 2013-02-20 | 2 | -0/+18 |
* | | | Merge pull request #9352 from senny/remove_uncommented_boot_test | Carlos Antonio da Silva | 2013-02-21 | 1 | -20/+0 |
|\ \ \ |
|
| * | | | remove uncommented railties boot_test.rb | Yves Senn | 2013-02-21 | 1 | -20/+0 |
* | | | | Fix warning | Rafael Mendonça França | 2013-02-21 | 1 | -1/+1 |
| |/ /
|/| | |
|
* | | | ActiveRecord -> Active Record [ci skip] | Xavier Noria | 2013-02-20 | 1 | -1/+1 |
* | | | Merge pull request #9345 from wangjohn/change_name_of_query_method_argument_c... | Rafael Mendonça França | 2013-02-20 | 1 | -10/+10 |
|\ \ \ |
|
| * | | | Renaming the check_empty_arguments method to something more descriptive. | wangjohn | 2013-02-20 | 1 | -10/+10 |
* | | | | removes relation bang methods from the AR changelog [ci skip] | Xavier Noria | 2013-02-20 | 1 | -12/+0 |
* | | | | removes some remaining relation bang methods documentation [ci skip] | Xavier Noria | 2013-02-20 | 1 | -3/+0 |
* | | | | puts a lambda around a default scope [ci skip] | Xavier Noria | 2013-02-20 | 1 | -1/+1 |
* | | | | adds an example in the docs of #not with multiple conditions [ci skip] | Xavier Noria | 2013-02-20 | 1 | -4/+8 |