aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-109-16/+92
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | copy edits [ci skip]Vijay Dev2013-03-102-4/+4
| | | | |
| * | | | fixed typo in strong parameters exampleYves Senn2013-03-091-1/+1
| | | | |
| * | | | strong parameter example for hashes with integer keys.Yves Senn2013-03-091-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | This replicates the situation described in https://github.com/rails/strong_parameters/issues/114
| * | | | Adding a note for :body option in `mail` method.Fabrizio Regini2013-03-081-0/+13
| | | | |
| * | | | fixing typo in the merging scopes sectionNeeraj Singh2013-03-081-4/+3
| | | | |
| * | | | Explained how merging of scope worksNeeraj Singh2013-03-081-0/+56
| | | | |
| * | | | Some copy edit and formatting for upgrading guide.Hendy Tanata2013-03-081-3/+3
| | | | |
| * | | | remove the new metadata note in Rails 4 upgrade guideAlex Robbin2013-03-071-6/+0
| | | | | | | | | | | | | | | | | | | | this was pulled out of Rails 4, see rails/rails#8399 for the discussion
| * | | | fixes active_record_querying #pluck exampleawilliams2013-03-071-1/+1
| | | | |
| * | | | Update capture_helper.rbJess Brown2013-03-061-1/+1
| | | | | | | | | | | | | | | if there's content for the right column, then we need the two-column class, if not the one-column
| * | | | TypppoAkira Matsuda2013-03-063-4/+4
| | | | |
* | | | | Fix AMo code example indent, add missing author to entry [ci skip]Carlos Antonio da Silva2013-03-091-6/+8
| | | | |
* | | | | Bump up timeoutsJon Leighton2013-03-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix travis. Also ensuring that we don't try to kill when pid is nil.
* | | | | Merge pull request #9629 from wangjohn/numbering_of_applicationrb_is_offSteve Klabnik2013-03-091-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Renumbering the comments in the application boot process.
| * | | | | Renumbering the comments in the application boot process.wangjohn2013-03-091-4/+4
|/ / / / /
* | | | | Merge pull request #9627 from rubys/masterCarlos Antonio da Silva2013-03-091-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | ensure response.stream is closed
| * | | | ensure response.stream is closedSam Ruby2013-03-091-0/+1
|/ / / /
* | | | Merge pull request #9621 from sakuro/migration-magic-comment-fixJeremy Kemper2013-03-094-3/+48
|\ \ \ \ | | | | | | | | | | Preserve magic comments and content encoding of copied migrations.
| * | | | Preserve magic comments and content encoding of copied migrations.OZAWA Sakuro2013-03-094-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | During insertion of "# This migration comes from ... " comment at the beginning of a migration, presence of magic comment was not considered.
* | | | | Merge pull request #9616 from exviva/multiple_select_name_double_square_bracketsCarlos Antonio da Silva2013-03-093-1/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrectly appended square brackets to a multiple select box Before: select(:category, [], {}, {:multiple => true, :name => "post[category][]"}) # => <select name="post[category][][]" ...> After: select(:category, [], {}, {:multiple => true, :name => "post[category][]"}) # => <select name="post[category][]" ...>
| * | | | | Fix incorrectly appended square brackets to a multiple select boxOlek Janiszewski2013-03-083-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an explicit name has been given and it already ends with "[]" Before: select(:category, [], {}, multiple: true, name: "post[category][]") # => <select name="post[category][][]" ...> After: select(:category, [], {}, multiple: true, name: "post[category][]") # => <select name="post[category][]" ...>
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 21:26:53 +0000