aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Changelog improvements, use 1.9 style hash in examples [ci skip]Carlos Antonio da Silva2013-02-222-14/+13
* Merge pull request #9347 from hoffm/number_to_human_bugSteve Klabnik2013-02-223-1/+19
|\
| * Address edge case for number_to_human with units option.hoffm2013-02-223-1/+19
* | Merge pull request #9384 from eval/documentation_of_minuteCarlos Antonio da Silva2013-02-222-4/+4
|\ \
| * | Correct comment for (beginning|end)_of_minuteGert Goet2013-02-222-4/+4
|/ /
* / Fix backwards compatibility with Rails 3 apps.Steve Klabnik2013-02-223-40/+52
|/
* Merge pull request #9334 from NARKOZ/time_tagAndrew White2013-02-212-19/+21
|\
| * document setting custom datetime attribute for time_tag helperNihad Abbasov2013-02-221-0/+2
| * fix time_tag helper and update tests to not rely on dynamically generated valuesNihad Abbasov2013-02-222-19/+19
* | Merge pull request #9365 from gaganawhad/core-ext-beginning-of-minuteAndrew White2013-02-216-0/+61
|\ \
| * | Added beginning_of_minute support to core_ext calculations for Time and DateTimeGagan Awhad2013-02-216-0/+61
* | | completes pass over the AP changelog [ci skip]Xavier Noria2013-02-212-15/+6
* | | tweaks to the AP changelog [ci skip]Xavier Noria2013-02-211-9/+3
* | | Merge pull request #9361 from senny/improved_match_shorthand_syntaxAndrew White2013-02-213-14/+53
|\ \ \ | |/ / |/| |
| * | determine the match shorthand target early.Yves Senn2013-02-213-14/+53
* | | Revert "Revert "Merge pull request #4803 from lucascaton/master""Santiago Pastorino2013-02-213-3/+5
* | | This cache is not neededSantiago Pastorino2013-02-211-2/+1
* | | Use composition to figure out the forgery protection strategySantiago Pastorino2013-02-211-9/+27
* | | Use #grep to filter priority zones when a regexp is givenCarlos Antonio da Silva2013-02-212-3/+5
* | | Use Array Difference to calculate the zones array, instead of iteratingCarlos Antonio da Silva2013-02-211-2/+2
* | | Fix test name and refactor fake timezones creation in form options testCarlos Antonio da Silva2013-02-211-3/+3
* | | Remove not necessary changelog about time zone array mutationCarlos Antonio da Silva2013-02-211-8/+0
* | | tweaks to the AP changelog [ci skip]Xavier Noria2013-02-211-42/+27
* | | Merge pull request #9358 from iwiznia/patch-1Xavier Noria2013-02-211-3/+3
|\ \ \ | |/ / |/| |
| * | Update railties/lib/rails/application/configuration.rbiwiznia2013-02-211-3/+3
| * | Update railties/lib/rails/application/configuration.rbiwiznia2013-02-211-1/+1
|/ /
* | Merge pull request #9354 from NARKOZ/remove-warningsSteve Klabnik2013-02-211-2/+2
|\ \
| * | remove assigned but unused variable warningNihad Abbasov2013-02-211-2/+2
* | | Merge pull request #9357 from fabiokr/rack_test_uploaded_fileXavier Noria2013-02-212-4/+6
|\ \ \ | |/ / |/| |
| * | Rack::Test::UploadedFile is a permitted scalarFabio Kreusch2013-02-212-4/+6
|/ /
* | Merge pull request #9348 from schuetzm/doc_no_indices_with_create_join_tableXavier Noria2013-02-212-0/+18
|\ \
| * | Indent comment block by two spaces.Marc Schütz2013-02-211-4/+4
| * | Add more documentation for create_join_table.Marc Schütz2013-02-202-0/+18
* | | Merge pull request #9352 from senny/remove_uncommented_boot_testCarlos Antonio da Silva2013-02-211-20/+0
|\ \ \
| * | | remove uncommented railties boot_test.rbYves Senn2013-02-211-20/+0
* | | | Fix warningRafael Mendonça França2013-02-211-1/+1
| |/ / |/| |
* | | ActiveRecord -> Active Record [ci skip]Xavier Noria2013-02-201-1/+1
* | | Merge pull request #9345 from wangjohn/change_name_of_query_method_argument_c...Rafael Mendonça França2013-02-201-10/+10
|\ \ \
| * | | Renaming the check_empty_arguments method to something more descriptive.wangjohn2013-02-201-10/+10
* | | | removes relation bang methods from the AR changelog [ci skip]Xavier Noria2013-02-201-12/+0
* | | | removes some remaining relation bang methods documentation [ci skip]Xavier Noria2013-02-201-3/+0
* | | | puts a lambda around a default scope [ci skip]Xavier Noria2013-02-201-1/+1
* | | | adds an example in the docs of #not with multiple conditions [ci skip]Xavier Noria2013-02-201-4/+8
* | | | database.yml -> config/database.yml [ci skip]Xavier Noria2013-02-201-1/+1
* | | | Revert "Merge pull request #4803 from lucascaton/master"Santiago Pastorino2013-02-203-5/+3
| |/ / |/| |
* | | Skip failing test and add a FIXME noteRafael Mendonça França2013-02-201-0/+2
* | | Merge pull request #9344 from senny/changelog_cleanupRafael Mendonça França2013-02-201-4/+4
|\ \ \
| * | | unify AR changelog entries [ci skip]Yves Senn2013-02-201-4/+4
|/ / /
* | | Merge pull request #8645 from senny/rename_index_on_rename_columnRafael Mendonça França2013-02-207-8/+73
|\ \ \
| * | | also rename indexes when a table or column is renamedYves Senn2013-02-207-8/+73
|/ / /