aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | Merge pull request #9658 from ↵Rafael Mendonça França2013-03-111-0/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | tkhr/add-assert-to-test_company_descends_from_active_record add an missing assertion to inheritance_test.rb
| | | * | | | | | | add an missing assertion to inheritance_test.rbTakehiro Adachi2013-03-111-0/+1
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assertion for https://github.com/rails/rails/blob/ad624345e54bd20802de67b2b5c9ef29ecf5 d5f4/activerecord/lib/active_record/inheritance.rb#L32
| | * | | | | | | Merge pull request #9653 from jetthoughts/masterCarlos Antonio da Silva2013-03-101-5/+5
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed tests `to_time` returning an instance of `Time` in the local system timezone. Tests for to_time returning an instance of Time in the local system timezone did not take in account DST when they used mixed timezone declarations like 'US/Eastern' and '-0500'. Replaced timezone with DST by timezone without DST.
| | | * | | | | | | Fixed tests for returning an instance of `Time` in the local system timezone.Paul Nikitochkin2013-03-101-5/+5
| | | | | | | | | |
| | * | | | | | | | Merge pull request #9651 from vipulnsward/change_to_each_value_intestCarlos Antonio da Silva2013-03-101-1/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Change from each to each_value on hash to avoid unused variable warning
| | | * | | | | | | | Change from each to each_value on hash to avoid unused variable warningVipul A M2013-03-111-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Merge pull request #9650 from yahonda/group_by_oracleRafael Mendonça França2013-03-101-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | Address ActiveRecord::StatementInvalid: OCIError: ORA-00979
| | | * | | | | | | | Address ActiveRecord::StatementInvalid: OCIError: ORA-00979Yasuo Honda2013-03-111-2/+2
| | | |/ / / / / / /
| | * | | | | | | | Merge pull request #9645 from senny/9643_habtm_wrong_table_nameCarlos Antonio da Silva2013-03-101-0/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | document habtm join-table name with custom prefix [ci skip]
| | | * | | | | | | document habtm join-table name with custom prefix [ci skip].Yves Senn2013-03-101-0/+2
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9643. The logic was introduced with 46492949
| | * | | | | | | Merge pull request #9638 from siong1987/debuggerCarlos Antonio da Silva2013-03-091-1/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Make sure that debugger isn't included in production environment.
| | | * | | | | | | Make sure that debugger isn't included in production environment.Teng Siong Ong2013-03-091-1/+1
| | |/ / / / / / /
| | * | | | | | | Change uniq validation with conditions examples to use where with hashesCarlos Antonio da Silva2013-03-092-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Take the opportunity to showcase where.not.
| | * | | | | | | Merge pull request #9637 from GSI/masterCarlos Antonio da Silva2013-03-091-0/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Include Montevideo time zone in list of aliases. Closes #9628
| | | * | | | | | | included "Montevideo" in list of time zone aliases (closes Issue #9628)Gernot2013-03-091-0/+1
| | | | | | | | | |
| | * | | | | | | | Merge pull request #9633 from senny/5321_make_it_lazyCarlos Antonio da Silva2013-03-093-4/+23
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uniqueness validation uses a proc to specify the `:conditions` option. This is a follow up to #5321 and follows the general direction in AR to make things lazy evaluated.
| | | * | | | | | | | Uniqueness validation uses a proc to specify the `:conditions` option.Yves Senn2013-03-093-4/+23
| | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to #5321 and follows the general direction in AR to make things lazy evaluated.
| | * | | | | | | | Merge pull request #9618 from manvsmachine/fix-postgres-enable-extension-errorCarlos Antonio da Silva2013-03-091-1/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfix for enable_extension in postgresql_adapter. The use of quotations is required to install extensions with certain characters in them (e.g. uuid-ossp).
| | | * | | | | | | | fixes enable_extension bug in postgresql_adapterDarren Woodley2013-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of quotations is required to install extensions with certain characters in them (e.g. uuid-ossp). removes CHANGELOG entry Deemed unnecessary.
| | * | | | | | | | | Fix "ActiveRecord" => "Active Record" in changelog [ci skip]Carlos Antonio da Silva2013-03-091-4/+3
| | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge pull request #9371 from benmoss/access-connection-via-classJon Leighton2013-03-097-13/+19
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Access an instance's connection via its class, rather than via #connection
| | | * | | | | | | | Deprecate #connection in favour of accessing it via the classBen Moss2013-03-097-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows end-users to have a `connection` method on their models without clashing with ActiveRecord internals.
| | * | | | | | | | | Merge pull request #9626 from dasch/dasch/instrument-strong-paramsJosé Valim2013-03-092-1/+7
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use AS::Notifications to instrument Strong Params
| | | * | | | | | | | | Use the instrumentation framework to instrument Strong ParamsDaniel Schierbeck2013-03-072-1/+7
| | | | | | | | | | | |
| | * | | | | | | | | | Fix race condition in testJon Leighton2013-03-091-2/+2
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix travis. For real this time! This is the one! The readpartial(100) meant that an earlier assert_stdout could chomp up the output that a later assert_stdout wants, meaning that the later assertion fails. Reading only 1 byte at a time ensure that we don't read any more than is necessary to verify the assertion.
| | * | | | | | | | | Merge pull request #9632 from senny/unify_the_changelogsCarlos Antonio da Silva2013-03-094-36/+37
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip]
| | | * | | | | | | | | Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip].Yves Senn2013-03-094-36/+37
| | |/ / / / / / / / /
| | * | | | | | | | | Merge pull request #9630 from robertjwhitney/update_collection_docsCarlos Antonio da Silva2013-03-091-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update documentation for collection<< to reflect behavior for new parent objects.
| | | * | | | | | | | | Update documentation for collection<< to reflect << on new records.Robert Whitney2013-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collection<< does not automatically fire update sql unless the parent object is not a new record (and thus has a primary key). eg: p = Post.new p.comments << Comment.new does not call update sql until: p.save at which point it saves the parent object and then the collection object. changes that to the
| * | | | | | | | | | | Revert "Using American English spellings over British style spellings"Vijay Dev2013-03-302-5/+5
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 573df1cf2a5d5d1f288c8a4a5d76194675141832. Reason: changelog edits aren't allowed in docrails. [ci skip]
| * | | | | | | | | | More typo / wording fixesJonathan Roes2013-03-291-6/+6
| | | | | | | | | | |
| * | | | | | | | | | Proofreading tweaksJonathan Roes2013-03-291-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Consistent hash structure - Rewording / typo fixes
* | | | | | | | | | | Added a section on Rails Controller naming conventions.Oliver Jakubiec2013-04-021-2/+12
|/ / / / / / / / / /
* | | | | | | | | | explain method invertible_for [ci skip]Neeraj Singh2013-03-291-1/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #130 from crafters/masterVinicius Quaiato2013-03-281-0/+26
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Adding info that Gemfile group :assets doesn't exists anymore
| * | | | | | | | | | info that Gemfile *group :assets* was removedVinicius Quaiato2013-03-291-0/+26
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | Adding info that Gemfile *group :assets* was removed on upgrading_ruby_on_rails.md
* | | | | | | | | | Minor proofingJonathan Roes2013-03-271-13/+13
| | | | | | | | | |
* | | | | | | | | | Remove unnecessary hyphen.Jonathan Roes2013-03-271-1/+1
| | | | | | | | | |
* | | | | | | | | | Extraneous syntax on guides path.Jonathan Roes2013-03-271-1/+1
| | | | | | | | | |
* | | | | | | | | | ReCAPTCHA plug-in link now points to Github repo. Plug-in is no longer ↵sthollmann2013-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available at the previous location
* | | | | | | | | | Fix typoCarson McDonald2013-03-261-1/+1
| | | | | | | | | |
* | | | | | | | | | localised => localizedPrathamesh Sonpatki2013-03-251-1/+1
| | | | | | | | | |
* | | | | | | | | | Fix some typosAkira Matsuda2013-03-252-2/+2
| | | | | | | | | |
* | | | | | | | | | s/Textmate/TextMate/Akira Matsuda2013-03-251-1/+1
| | | | | | | | | |
* | | | | | | | | | s/Github/GitHub/Akira Matsuda2013-03-251-1/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | fix some typosVipul A M2013-03-252-3/+3
| | | | | | | | |
* | | | | | | | | correct some typo in earlier commit.Deshi Xiao2013-03-241-1/+1
| | | | | | | | |
* | | | | | | | | correct test command's typoDeshi Xiao2013-03-241-13/+13
| | | | | | | | |
* | | | | | | | | view/views, asset/assetsPrathamesh Sonpatki2013-03-242-2/+2
| | | | | | | | |
* | | | | | | | | s/app\/model\//app\/models\//gAkira Matsuda2013-03-242-6/+6
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 18:48:21 +0000