| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge pull request #9657 from vipulnsward/cleanup_tests | Rafael Mendonça França | 2013-03-11 | 3 | -4/+2 | |
| |\ \ \ | | | | | | | | | Cleanup tests for unused variables | |||||
| | * | | | Cleanup tests for unused variables | Vipul A M | 2013-03-11 | 3 | -4/+2 | |
| | | |/ | |/| | ||||||
| * | | | Merge pull request #9658 from ↵ | Rafael Mendonça França | 2013-03-11 | 1 | -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.rb | Takehiro Adachi | 2013-03-11 | 1 | -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/master | Carlos Antonio da Silva | 2013-03-10 | 1 | -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 Nikitochkin | 2013-03-10 | 1 | -5/+5 | |
| | | | | ||||||
| * | | | Merge pull request #9651 from vipulnsward/change_to_each_value_intest | Carlos Antonio da Silva | 2013-03-10 | 1 | -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 warning | Vipul A M | 2013-03-11 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge pull request #9650 from yahonda/group_by_oracle | Rafael Mendonça França | 2013-03-10 | 1 | -2/+2 | |
| |\ \ \ \ | |_|/ / |/| | | | Address ActiveRecord::StatementInvalid: OCIError: ORA-00979 | |||||
| | * | | | Address ActiveRecord::StatementInvalid: OCIError: ORA-00979 | Yasuo Honda | 2013-03-11 | 1 | -2/+2 | |
| | |/ / | ||||||
| * | | | Merge pull request #9645 from senny/9643_habtm_wrong_table_name | Carlos Antonio da Silva | 2013-03-10 | 1 | -0/+2 | |
| |\ \ \ | |/ / |/| | | document habtm join-table name with custom prefix [ci skip] | |||||
| | * | | document habtm join-table name with custom prefix [ci skip]. | Yves Senn | 2013-03-10 | 1 | -0/+2 | |
| |/ / | | | | | | | | | | | Closes #9643. The logic was introduced with 46492949 | |||||
| * | | Merge pull request #9638 from siong1987/debugger | Carlos Antonio da Silva | 2013-03-09 | 1 | -1/+1 | |
| |\ \ | | | | | | | Make sure that debugger isn't included in production environment. | |||||
| | * | | Make sure that debugger isn't included in production environment. | Teng Siong Ong | 2013-03-09 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Change uniq validation with conditions examples to use where with hashes | Carlos Antonio da Silva | 2013-03-09 | 2 | -5/+5 | |
| | | | | | | | | | Take the opportunity to showcase where.not. | |||||
| * | | Merge pull request #9637 from GSI/master | Carlos Antonio da Silva | 2013-03-09 | 1 | -0/+1 | |
| |\ \ | | | | | | | Include Montevideo time zone in list of aliases. Closes #9628 | |||||
| | * | | included "Montevideo" in list of time zone aliases (closes Issue #9628) | Gernot | 2013-03-09 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Merge pull request #9633 from senny/5321_make_it_lazy | Carlos Antonio da Silva | 2013-03-09 | 3 | -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 Senn | 2013-03-09 | 3 | -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-error | Carlos Antonio da Silva | 2013-03-09 | 1 | -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_adapter | Darren Woodley | 2013-03-08 | 1 | -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 Silva | 2013-03-09 | 1 | -4/+3 | |
| | |/ / |/| | | ||||||
| * | | | Merge pull request #9371 from benmoss/access-connection-via-class | Jon Leighton | 2013-03-09 | 7 | -13/+19 | |
| |\ \ \ | | | | | | | | | Access an instance's connection via its class, rather than via #connection | |||||
| | * | | | Deprecate #connection in favour of accessing it via the class | Ben Moss | 2013-03-09 | 7 | -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-params | José Valim | 2013-03-09 | 2 | -1/+7 | |
| |\ \ \ \ | | | | | | | | | | | Use AS::Notifications to instrument Strong Params | |||||
| | * | | | | Use the instrumentation framework to instrument Strong Params | Daniel Schierbeck | 2013-03-07 | 2 | -1/+7 | |
| | | | | | | ||||||
| * | | | | | Fix race condition in test | Jon Leighton | 2013-03-09 | 1 | -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_changelogs | Carlos Antonio da Silva | 2013-03-09 | 4 | -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 Senn | 2013-03-09 | 4 | -36/+37 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #9630 from robertjwhitney/update_collection_docs | Carlos Antonio da Silva | 2013-03-09 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | Update documentation for collection<< to reflect behavior for new parent objects. | |||||
| | * | | | | Update documentation for collection<< to reflect << on new records. | Robert Whitney | 2013-03-09 | 1 | -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/docrails | Vijay Dev | 2013-03-10 | 9 | -16/+92 | |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| | * | | | | copy edits [ci skip] | Vijay Dev | 2013-03-10 | 2 | -4/+4 | |
| | | | | | | ||||||
| | * | | | | fixed typo in strong parameters example | Yves Senn | 2013-03-09 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | strong parameter example for hashes with integer keys. | Yves Senn | 2013-03-09 | 1 | -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 Regini | 2013-03-08 | 1 | -0/+13 | |
| | | | | | | ||||||
| | * | | | | fixing typo in the merging scopes section | Neeraj Singh | 2013-03-08 | 1 | -4/+3 | |
| | | | | | | ||||||
| | * | | | | Explained how merging of scope works | Neeraj Singh | 2013-03-08 | 1 | -0/+56 | |
| | | | | | | ||||||
| | * | | | | Some copy edit and formatting for upgrading guide. | Hendy Tanata | 2013-03-08 | 1 | -3/+3 | |
| | | | | | | ||||||
| | * | | | | remove the new metadata note in Rails 4 upgrade guide | Alex Robbin | 2013-03-07 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | | | | | | | this was pulled out of Rails 4, see rails/rails#8399 for the discussion | |||||
| | * | | | | fixes active_record_querying #pluck example | awilliams | 2013-03-07 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Update capture_helper.rb | Jess Brown | 2013-03-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | if there's content for the right column, then we need the two-column class, if not the one-column | |||||
| | * | | | | Typppo | Akira Matsuda | 2013-03-06 | 3 | -4/+4 | |
| | | | | | | ||||||
| * | | | | | Fix AMo code example indent, add missing author to entry [ci skip] | Carlos Antonio da Silva | 2013-03-09 | 1 | -6/+8 | |
| | | | | | | ||||||
| * | | | | | Bump up timeouts | Jon Leighton | 2013-03-09 | 1 | -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_off | Steve Klabnik | 2013-03-09 | 1 | -4/+4 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Renumbering the comments in the application boot process. | |||||
| | * | | | | | Renumbering the comments in the application boot process. | wangjohn | 2013-03-09 | 1 | -4/+4 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #9627 from rubys/master | Carlos Antonio da Silva | 2013-03-09 | 1 | -0/+1 | |
| |\ \ \ \ \ | |_|/ / / |/| | | | | ensure response.stream is closed | |||||
| | * | | | | ensure response.stream is closed | Sam Ruby | 2013-03-09 | 1 | -0/+1 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #9621 from sakuro/migration-magic-comment-fix | Jeremy Kemper | 2013-03-09 | 4 | -3/+48 | |
| |\ \ \ \ | | | | | | | | | | | Preserve magic comments and content encoding of copied migrations. | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |