| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #16707 from katmutua/master | Santiago Pastorino | 2014-08-27 | 1 | -3/+3 |
| |\ | | | | | update 4_2_release_notes | ||||
| | * | [ci skip] Update 4_2_release notes | Jackie Mutua | 2014-08-27 | 1 | -3/+3 |
| | | | |||||
| * | | Merge pull request #16702 from sgrif/sg-binary-serialized | Rafael Mendonça França | 2014-08-27 | 3 | -0/+31 |
| |\ \ | | | | | | | Correctly detect mutation on serialized columns mapping to binary | ||||
| | * | | Correctly detect mutation on serialized columns mapping to binary | Sean Griffin | 2014-08-27 | 3 | -0/+31 |
| | | | | | | | | | | | | | Fixes #16701 | ||||
| * | | | Merge pull request #16722 from yui-knk/fix/guides_association_basics2 | Rafael Mendonça França | 2014-08-27 | 1 | -4/+4 |
| |\ \ \ | | | | | | | | | [ci skip] Fix typo of `collection_singular_ids=` method. | ||||
| | * | | | [ci skip] Fix typo of `collection_singular_ids=` method. | yui-knk | 2014-08-27 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Merge pull request #16721 from yui-knk/fix/guides_association_basics | Rafael Mendonça França | 2014-08-27 | 1 | -4/+4 |
| |\ \ \ \ | |/ / / |/| | | | [ci skip] Fix typo of `collection=` method. | ||||
| | * | | | [ci skip] Fix typo of `collection=` method. | yui-knk | 2014-08-27 | 1 | -4/+4 |
| |/ / / | |||||
| * | | | Merge pull request #16719 from tgxworld/fix_spelling_in_changelog | Arun Agrawal | 2014-08-27 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Fix spelling. [CI SKIP] | ||||
| | * | | | Fix spelling. [CI SKIP] | Guo Xiang Tan | 2014-08-27 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | fix broken `gem` method with non-String arguments. Closes #16709. | Yves Senn | 2014-08-27 | 3 | -4/+23 |
| | | | | | | | | | | | | | This was caused by #15327. | ||||
| * | | | minor changelog formatting changes. | Yves Senn | 2014-08-27 | 3 | -9/+11 |
| | | | | |||||
| * | | | Merge pull request #16661 from edogawaconan/doc-fix | Yves Senn | 2014-08-27 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Update documentation to match change in #5942 [ci skip] | ||||
| | * | | | Update documentation to match change in #5942 [ci skip] | edogawaconan | 2014-08-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #16715 from y-yagi/update_4_2_release_notes | Zachary Scott | 2014-08-27 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | [ci skip] Modify a web-console PR link for release noted | ||||
| | * | | | | [ci skip] Modify a web-console PR link | yuuji.yaginuma | 2014-08-27 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #16713 from tomkadwill/documented_eqls_other_param | Zachary Scott | 2014-08-27 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | [ci skip] Updated documentation syntax of other parameter for rdoc | ||||
| | * | | | | [ci skip] Updated documentation syntax of other parameter for rdoc | Tom Kadwill | 2014-08-27 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #16708 from zzak/bcjordan-patch-1 | Zachary Scott | 2014-08-26 | 1 | -16/+16 |
| |\ \ \ \ | | | | | | | | | | | Adjusted punctuation and grammar for Form Helpers guide [ci skip] | ||||
| | * | | | | Adjusted punctuation and grammar for Form Helpers guide [ci skip] | Brian Jordan | 2014-08-26 | 1 | -16/+16 |
| |/ / / / | |||||
| * | | | | Merge pull request #16705 from tomkadwill/documented_many_block_param | Zachary Scott | 2014-08-26 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | [ci skip] Updated documentation syntax of block parameter for rdoc | ||||
| | * | | | | [ci skip] Updated documentation syntax of block parameter for rdoc | Tom Kadwill | 2014-08-26 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #16706 from tomkadwill/documented_include_record_param | Zachary Scott | 2014-08-26 | 1 | -1/+1 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | [ci skip] Updated include to reference record parameter for rdoc | ||||
| | * | | | | [ci skip] Updated include to reference record parameter for rdoc | Tom Kadwill | 2014-08-26 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #16703 from tomkadwill/documented_any_block_param | Zachary Scott | 2014-08-26 | 1 | -1/+1 |
| |\| | | | | | | | | | | | [ci skip] Updated documentation syntax of block parameter for rdoc | ||||
| | * | | | [ci skip] Updated documentation syntax of block parameter for rdoc | Tom Kadwill | 2014-08-26 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #16700 from seuros/autoload | Rafael Mendonça França | 2014-08-26 | 3 | -2/+18 |
| |\ \ \ | | | | | | | | | [ActiveJob] Autoload adapters | ||||
| | * | | | [ActiveJob] Autoload adapters | Abdelkader Boudih | 2014-08-26 | 3 | -2/+18 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #16613 from splattael/master | Matthew Draper | 2014-08-27 | 1 | -7/+10 |
| |\ \ \ | | | | | | | | | | | | | Speed up JRuby tests by improving the startup time | ||||
| | * | | | Speed up JRuby tests by improving its startup time | Peter Suschlik | 2014-08-25 | 1 | -7/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emulate `jruby --dev` which improves JRuby's startup time. See https://github.com/jruby/jruby/wiki/Improving-startup-time#use-the---dev-flag Follow @headius' idea and give Java more memory to reduce GC time. | ||||
| * | | | | Keep the first string we fetch | Matthew Draper | 2014-08-27 | 1 | -1/+1 |
| | |/ / |/| | | | | | | | | Otherwise, it's possible for GC to run in between, and fail the test. | ||||
| * | | | Merge pull request #16697 from ↵ | Zachary Scott | 2014-08-26 | 1 | -0/+15 |
| |\ \ \ | | | | | | | | | | | | | | | | | tomkadwill/has_and_belongs_to_many_documenting_extension_param [ci skip] Added documentation for has_and_belongs_to_many extension parameter | ||||
| | * | | | [ci skip] Added documentation for has_and_belongs_to_many extension parameter | Tom Kadwill | 2014-08-26 | 1 | -0/+15 |
| |/ / / | |||||
| * | | | Merge pull request #16646 from sgrif/sg-perf-regression | Jeremy Kemper | 2014-08-25 | 1 | -1/+20 |
| |\ \ \ | | | | | | | | | Cache the value of `changed_attributes` when calling `changes_applied` | ||||
| | * | | | Cache the value of `changed_attributes` when calling `changes_applied` | Sean Griffin | 2014-08-22 | 1 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `changes_applied` calles `changes`, which will call `changed_attributes` multiple times in a loop. This method actually performs work now, so we should cache the results while looping over it when we know it cannot change. | ||||
| * | | | | Override #find_by! in core to enable AST caching | Godfrey Chan | 2014-08-25 | 2 | -0/+26 |
| | | | | | |||||
| * | | | | Fixed find_by("sql fragment without bindings") on master | Godfrey Chan | 2014-08-25 | 4 | -17/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Also duplicated find_by tests from relations_test.rb to finder_test.rb now that we have a completely different implementation on the class (in core.rb with AST caching stuff). * Also removed a (failing) test that used mocks. Now that we have tests for the behavior, there's no point having another test that tests the implementation (that it delegates). Further, what the test was implying is nolonger true with the current implementation, because Class.find_by is a real method now. | ||||
| * | | | | Merge pull request #16695 from ericbrooke/patch-1 | Rafael Mendonça França | 2014-08-25 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Added web links | ||||
| | * | | | | Added web links | Eric Brooke | 2014-08-25 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | Added web links to resque, delayed_job and sidekiq | ||||
| * | | | | Merge pull request #16689 from ankit1910/improve-english | Eileen M. Uchitelle | 2014-08-25 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | [ci skip] make assert messages consistent | ||||
| | * | | | | [ci skip] make assert messages consistent | ankit1910 | 2014-08-25 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #16682 from untidy-hair/use_activesupport_concern | Jeremy Kemper | 2014-08-25 | 1 | -7/+7 |
| |\ \ \ \ \ | | | | | | | | | | | | | Use ActiveSupport::Concern | ||||
| | * | | | | | Use ActiveSupport::Concern instead of the traditinal way | Yukio Mizuta | 2014-08-25 | 1 | -7/+7 |
| | | | | | | | |||||
| * | | | | | | Quick pass through the 4.2 release notes [ci skip] | Robin Dupret | 2014-08-25 | 1 | -20/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a few typos and made some tiny improvements. Refs #16576. [Zachary Scott & Robin Dupret] | ||||
| * | | | | | | Merge pull request #16690 from ankit1910/proper-use-of-aporstrophe | Rafael Mendonça França | 2014-08-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | [ci skip] use proper apostrophe | ||||
| | * | | | | | | [ci skip] use proper apostrophe | ankit1910 | 2014-08-25 | 1 | -1/+1 |
| | | |/ / / / | |/| | | | | |||||
| * | | | | | | Merge pull request #16488 from agrobbin/form-label-builder | Jeremy Kemper | 2014-08-25 | 3 | -22/+62 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Provide a builder for form labels to customize wrapping around I18n content | ||||
| | * | | | | | provide a builder for form labels to customize wrapping around I18n content | Alex Robbin | 2014-08-20 | 3 | -22/+62 |
| | | | | | | | |||||
| * | | | | | | pg, `default_sequence_name` needs to return a string. | Yves Senn | 2014-08-25 | 3 | -8/+12 |
| | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a reacon to https://github.com/rails/rails/commit/d6c1205584b1ba597db4071b168681678b1e9875#commitcomment-7502487 This backwards incompatibility was introduced with d6c12055 to fix #7516. However both `connection.default_sequence_name` and `model.sequence_name` are public API. The PostgreSQL adapter should honor the interface and return strings. /cc @matthewd @chancancode | ||||
| * | | | | | Merge pull request #16681 from seuros/master | Jeremy Kemper | 2014-08-24 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | [ActiveJob] Add activesupport as dependency [ci skip] | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |