aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Oracle enhanced adapter shortens its name if it is longer than 30 bytesYasuo Honda2013-02-241-2/+10
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | because of Oracle database index length spec.
* | | | | | | | | 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.rb
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 optionXavier Noria2013-02-241-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the first FIXME comment in the patch for the rationale.
* | | | | | | | | 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 directory
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Forwardport #9388 rename/remove column preserves custom PK.
| * | | | | | | | | rename_column_test.rb -> columns_test.rb to reveal intent.Yves Senn2013-02-231-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 Senn2013-02-231-1/+15
|/ / / / / / / / /
* | | | | | | | | Merge pull request #9387 from boukevanderbijl/masterCarlos Antonio da Silva2013-02-231-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix debug helper not inspecting when it can't convert to YAML
| * | | | | | | | | Fix debug helper not inspecting on ExceptionBouke van der Bijl2013-02-231-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 ASCarlos Antonio da Silva2013-02-222-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 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.
| * | | | | | | | | Address edge case for number_to_human with units option.hoffm2013-02-223-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_minuteCarlos Antonio da Silva2013-02-222-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Correct comment for (beginning|end)_of_minute [ci skip]
| * | | | | | | | | | 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
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_tagAndrew White2013-02-212-19/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | use ISO 8601 format in time_tag helper
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-minuteAndrew White2013-02-216-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 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.
| * | | | | | | | | | determine the match shorthand target early.Yves Senn2013-02-213-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 Pastorino2013-02-213-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d.
* | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's faster, and doesn't force us to dup the timezones array.
* | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Noria2013-02-211-42/+27
| | | | | | | | |
* | | | | | | | | Merge pull request #9358 from iwiznia/patch-1Xavier Noria2013-02-211-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Update railties/lib/rails/application/configuration.rb
| * | | | | | | | Update railties/lib/rails/application/configuration.rbiwiznia2013-02-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Better comment for database_configuration method
| * | | | | | | | Update railties/lib/rails/application/configuration.rbiwiznia2013-02-211-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | Changed comment that referenced the property #database_configuration_file, now it's paths["config/database"]
* | | | | | | | Merge pull request #9354 from NARKOZ/remove-warningsSteve Klabnik2013-02-211-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | remove assigned but unused variables
| * | | | | | | | 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 scalar
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add more documentation for create_join_table.
| * | | | | | | Indent comment block by two spaces.Marc Schütz2013-02-211-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As requested by @fxn https://github.com/schuetzm/rails/commit/743d15bba182df80d003d205690ead988970299c#commitcomment-2661417
| * | | | | | | Add more documentation for create_join_table.Marc Schütz2013-02-202-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain that it doesn't create indices by default and that it also has a block form.
* | | | | | | | Merge pull request #9352 from senny/remove_uncommented_boot_testCarlos Antonio da Silva2013-02-211-20/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove commented railties boot_test.rb
| * | | | | | | | remove uncommented railties boot_test.rbYves Senn2013-02-211-20/+0
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 17:59:16 +0000