aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9398 from senny/revert_precompile_config_moveGuillermo Iguaran2013-02-243-10/+6
|\
| * Revert "move config.assets.precompile into config/application.rb"Yves Senn2013-02-243-10/+6
|/
* fix respond_to without blocks not working if one of the blocks is allgrosser2013-02-244-1/+25
* Merge pull request #9356 from senny/988_multiple_actions_for_after_commitSteve Klabnik2013-02-243-14/+60
|\
| * multiple actions for :on option with `after_commit` and `after_rollback`Yves Senn2013-02-213-14/+60
* | Merge pull request #9397 from senny/9201_duplicate_associations_with_natural_keyRafael Mendonça França2013-02-242-0/+12
|\ \
| * | test case to prevent duplicated associations with custom PK.Yves Senn2013-02-242-0/+12
|/ /
* | Merge pull request #9395 from yahonda/oracle_index_lengthCarlos Antonio da Silva2013-02-231-2/+10
|\ \
| * | Oracle enhanced adapter shortens its name if it is longer than 30 bytesYasuo Honda2013-02-241-2/+10
|/ /
* | Merge pull request #9394 from senny/actually_rename_the_test_caseRafael Mendonça França2013-02-231-1/+1
|\ \
| * | also rename the test-case class inside columns_test.rbYves Senn2013-02-241-1/+1
|/ /
* | Revert "prevent minitest from printing a --seed run option"Xavier Noria2013-02-241-12/+2
* | prevent minitest from printing a --seed run optionXavier Noria2013-02-241-2/+12
* | registers the encrypted session store in the AP changelogXavier Noria2013-02-231-0/+4
* | Merge pull request #9393 from rubys/masterGuillermo Iguaran2013-02-231-1/+1
|\ \
| * | guides/rails_guides moved up and out of the railties directorySam Ruby2013-02-231-1/+1
* | | adds a missing LIMIT 1 in #take docsXavier Noria2013-02-231-1/+1
|/ /
* | Merge pull request #9389 from senny/forwardport_9388Carlos Antonio da Silva2013-02-231-1/+15
|\ \
| * | rename_column_test.rb -> columns_test.rb to reveal intent.Yves Senn2013-02-231-0/+0
| * | forwardport #9388 rename/remove column preserves custom PK.Yves Senn2013-02-231-1/+15
|/ /
* | Merge pull request #9387 from boukevanderbijl/masterCarlos Antonio da Silva2013-02-231-1/+1
|\ \
| * | Fix debug helper not inspecting on ExceptionBouke van der Bijl2013-02-231-1/+1
|/ /
* | Move number_to_human test from AP to ASCarlos Antonio da Silva2013-02-222-5/+7
* | 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
|\ \ \