aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Remove changelog entry from #8441 [ci skip]Carlos Antonio da Silva2012-12-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue only happens on master due to internal AR refactorings, so there is no need for a changelog entry. The test was backported to 3-2-stable to ensure there won't be any regressions.
* | | | | | | Merge pull request #8484 from gclag/dynamic-index-refinementsXavier Noria2012-12-111-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Explain how to supersede the new dynamic welcome page
| * | | | | | | Explain how to supersede the new dynamic welcome pageGeorge Claghorn2012-12-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old, static welcome page instructed developers to delete the public/index.html file and set a root route. The new, dynamic welcome page should tell developers (a) why they're seeing it when it doesn't correspond to anything in the viewable app source and (b) that it can be superseded with a root route.
* | | | | | | | Deprecate Date#to_time_in_current_zoneAndrew White2012-12-115-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The to_time_in_current_zone method doesn't match the naming of the methods for converting to ActiveSupport::TimeWithZone on Time and DateTime. Since DateTime inherits from Date that has led to confusion with some users using the to_time_in_current_zone method with DateTime instances and having the time part dropped and the UTC offset lost. This commit fixes this by deprecating the old method and adding a new in_time_zone method which matches the naming for DateTime and Time. This should prevent accidently dropping times and UTC offsets when converting DateTime instances to ActiveSupport::TimeWithZone.
* | | | | | | | Add missing at_end_of_* aliasesAndrew White2012-12-113-0/+5
| | | | | | | |
* | | | | | | | Add String#in_time_zone methodAndrew White2012-12-114-24/+60
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a convenience method for converting a string to an ActiveSupport::TimeWithZone instance using the configured Time.zone or another passed as an argument.
* | | | | | | Merge pull request #8482 from BanzaiMan/defensive_matching_on_default_index_pageSantiago Pastorino2012-12-101-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Match the controller and path names defensively.
| * | | | | | | Match the controller and path names defensively.Hiro Asari2012-12-101-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Use '\A' instead of '^', and make the alteration shorter.
* | | | | | | Merge pull request #8468 from schneems/schneems/rack-index-pageSantiago Pastorino2012-12-1012-28/+55
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use Rails to Render Default Index Page
| * | | | | | | Use Rails to Render Default Index Pageschneems2012-12-1012-28/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an alternative implementation to #7771 thanks to the advice of @spastorino Rails is a dynamic framework that serves a static index.html by default. One of my first questions ever on IRC was solved by simply deleting my public/index.html file. This file is a source of confusion when starting as it over-rides any set "root" in the routes yet it itself is not listed in the routes. By making the page dynamic by default we can eliminate this confusion. This PR moves the static index page to an internal controller/route/view similar to `rails/info`. When someone starts a rails server, if no root is defined, this route will take over and the "dynamic" index page from rails/welcome_controller will be rendered. These routes are only added in development. If a developer defines a root in their routes, it automatically takes precedence over this route and will be rendered, with no deleting of files required. In addition to removing this source of confusion for new devs, we can now use Rails view helpers to build and render this page. While not the primary intent, the added value of "dogfooding" should not be under-estimated. The prior PR #7771 had push-back since it introduced developer facing files. This PR solves all of the same problems, but does not have any new developer facing files (it actually removes one). cc/ @wsouto, @dickeyxxx, @tyre, @ryanb, @josevalim, @maxim, @subdigital, @steveklabnik ATP Railties and Actionpack.
* | | | | | | | Make sure that no extra spaces are created with a non-polymorphicRafael Mendonça França2012-12-102-4/+8
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | attributes
* | | | | | | Add CHANGELOG entry for #6376.Rafael Mendonça França2012-12-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG.md
* | | | | | | Allow users to choose the timestamp format in the cache keyRafael Mendonça França2012-12-105-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be done using the class attribute cache_timestamp_format Conflicts: railties/guides/source/configuring.textile
* | | | | | | Make sure the tests pass in the case closer to described in #8195Rafael Mendonça França2012-12-104-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/test/models/bulb.rb activerecord/test/schema/schema.rb
* | | | | | | Added regression test for #8195.jacobstr2012-12-101-0/+18
| | | | | | |
* | | | | | | Move new CHANGELOG entry to the topRafael Mendonça França2012-12-101-9/+9
| | | | | | |
* | | | | | | Merge pull request #8476 from sheerun/fix/multipart-getRafael Mendonça França2012-12-103-1/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Prevent raising EOFError on multipart GET request.
| * | | | | | | Prevent raising EOFError on multipart GET request.Adam Stankiewicz2012-12-103-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Such request can happen on Internet Explorer. When we redirect after multipart form submission, the request type is changed to GET, but Content-Type is preserved as multipart. GET request cannot have multipart body and that caused Rails to fail. It's similar fix to Rack's one: https://github.com/chneukirchen/rack/blob/8025a4ae9477d1e6231344c2b7d795aa9b3717b6/lib/rack/request.rb#L224
* | | | | | | | Merge pull request #8450 from senny/8448_mailer_return_valuesRafael Mendonça França2012-12-104-2/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | the return value of mailer methods should not be relevant
| * | | | | | | | The return value from mailer methods is not relevant.Yves Senn2012-12-104-2/+16
| | | | | | | | |
* | | | | | | | | Merge pull request #8441 from itzki/fix_decorate_columnsCarlos Antonio da Silva2012-12-103-4/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix decorate_columns for finding only non-serialized columns
| * | | | | | | | | Fix decorating columns for serialized attributesitzki2012-12-103-4/+20
|/ / / / / / / / /
* | | | | | | | | Merge branch 'scaffold_fixes'Rafael Mendonça França2012-12-1010-22/+84
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ensure the scaffold tests will pass when using references attributesRafael Mendonça França2012-12-101-0/+10
| | | | | | | | | |
| * | | | | | | | | Add GeneratedAttribute#column_name to get the name of the column in theRafael Mendonça França2012-12-104-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | database
| * | | | | | | | | Extract a attributes_names method to avoid duplicationRafael Mendonça França2012-12-104-22/+12
| | | | | | | | | |
| * | | | | | | | | Deal with polymorphic attributes correctly in the generatorsRafael Mendonça França2012-12-106-10/+41
| | | | | | | | | |
| * | | | | | | | | Make references and belongs_to attributes to generate the _id column inRafael Mendonça França2012-12-102-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixtures
| * | | | | | | | | Put the reference and belongs_to attributes in the scaffold tests.Rafael Mendonça França2012-12-103-12/+9
| | | | | | | | | |
| * | | | | | | | | Use the references and belongs_id ids in the scaffold_controllerRafael Mendonça França2012-12-092-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generator
| * | | | | | | | | Add test case for scaffold_controller generator without attributes.Rafael Mendonça França2012-12-091-0/+9
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | This is a test for 978c568a7bffe354180aaefa471092182fed1015
* | | | | | | | | Merge pull request #8472 from schneems/schneems/expand_pathRafael Mendonça França2012-12-091-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Use `File.expand_path` instead of `File.join`
| * | | | | | | | Use `File.expand_path` instead of `File.join`schneems2012-12-091-1/+1
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | cc/ @carlosantoniodasilva
* | | | | | | | Revert "Omit directories from gemspec.files for RubyGems 2 compat."Jeremy Kemper2012-12-097-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Obviated by rubygems/rubygems@486ed83cc8e706069213c5d406122f4cfcca9e7f This reverts commit bb8923dee093b615615cdfb83b34d1b0bb254f25.
* | | | | | | | Move to the schema-migrations-metadata branch.Jeremy Kemper2012-12-0915-266/+60
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pending work on graceful app upgrades. Revert "Merge pull request #8439 from joshsusser/fixes" This reverts commit ce8ac39338f86388e70356b3a470b3ea443802ae, reversing changes made to b0e7b6f67c984d4b1502e801781ed75fad681633. Revert "Merge pull request #8431 from joshsusser/schemadump" This reverts commit 036d3e1c2b65c4b8cbd23de2e20ad67b9b756182, reversing changes made to 0c692f4d121792117b6a71e5ed590a31c3b9d12e. Revert "Merge branch 'joshsusser-master' into merge" This reverts commit 0c692f4d121792117b6a71e5ed590a31c3b9d12e, reversing changes made to 2e299fca715b083a60222a85e48f9d3b8dd8ce93. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/schema_dumper_test.rb
* | | | | | | revise block on kindle guides [ci skip]Vijay Dev2012-12-091-3/+1
| | | | | | |
* | | | | | | Remove the spaces after the open bracket and before the close bracket.Rafael Mendonça França2012-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All our generated code follow this rule
* | | | | | | Merge pull request #8469 from kytrinyx/explicit-mysql-instructionsRafael Mendonça França2012-12-091-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include command to create mysql user [ci skip]
| * | | | | | | Include command to create mysql userKatrina Owen2012-12-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The guide mentions that the 'rails' user is needed, but doesn't explicitly include the command to do so.
* | | | | | | | Revert "API reader should look elsewhere for helper instructions"Vijay Dev2012-12-091-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ba2d867b2961b5ef72aad353c2d647b04654cbe3. Reason: https://github.com/lifo/docrails/commit/ba2d867b2961b5ef72aad353c2d647b04654cbe3#commitcomment-2276670 [ci skip]
* | | | | | | | Merge pull request #8466 from gclag/stats-handle-new-test-locationsJeremy Kemper2012-12-081-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make rake task for code statistics handle new test locations properly
| * | | | | | | | Make code statistics rake task handle new test locations properlyGeorge Claghorn2012-12-091-1/+7
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of 2a68f68aead9fd65ecac8062ca8efc15f5bab418: - Unit tests are now in test/models, instead of test/units - Functional tests are now in test/controllers, instead of test/functional - Helper tests are now in test/helpers, instead of test/units/helpers - Mailer tests are now in test/mailers, instead of test/functional Update the rake task for code statistics (`rake stats`) so that it recognizes files in the above locations as tests, and accurately calculates statistics such as "Test LOC" and "Code to Test Ratio." Safely handle Rails apps that still have tests in the old locations.
* | | | | | | | Omit directories from gemspec.files for RubyGems 2 compat.Jeremy Kemper2012-12-087-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RG2 packager expects each spec.files path to be a file and bombs when it tries to tarball a dir. May revert if rubygems/rubygems#413 is accepted.
* | | | | | | | Fix method assertion ensuring it will match "end" with the same indentationCarlos Antonio da Silva2012-12-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise it was matching "end" lines from blocks within the method body, making tests such as the migration ones fail.
* | | | | | | | Merge pull request #8346 from sodabrew/patch-1Jeremy Kemper2012-12-088-34/+144
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add `variables:` to database.yml for mysql, mysql2, and postgresql adapters
| * | | | | | | | Session variables for mysql, mysql2, and postgresql adapters can be setAaron Stone2012-12-088-34/+144
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the new 'variables:' hash in each database config section in database.yml. The key-value pairs of this hash will be sent in a 'SET key = value, ...' query on new database connections. The configure_connection methods from mysql and mysql2 into are consolidated into the abstract_mysql base class.
* | | | | | | | Merge pull request #8348 from danchoi/masterVijay Dev2012-12-084-5/+128
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Kindle ebook generation with working section navigation
| * | | | | | | | Add periodical-style TOC and navigation to Kindle version of guidesDaniel Choi2012-12-014-5/+128
| | | | | | | | |
* | | | | | | | | update release notes [ci skip]Vijay Dev2012-12-081-1/+41
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-0832-172/+196
|\ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 05:34:24 +0000