aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ci skip] Fix typo of `collection_singular_ids=` method.yui-knk2014-08-271-4/+4
|
* Merge pull request #16719 from tgxworld/fix_spelling_in_changelogArun Agrawal2014-08-271-1/+1
|\ | | | | Fix spelling. [CI SKIP]
| * Fix spelling. [CI SKIP]Guo Xiang Tan2014-08-271-1/+1
|/
* fix broken `gem` method with non-String arguments. Closes #16709.Yves Senn2014-08-273-4/+23
| | | | This was caused by #15327.
* minor changelog formatting changes.Yves Senn2014-08-273-9/+11
|
* Merge pull request #16661 from edogawaconan/doc-fixYves Senn2014-08-271-1/+1
|\ | | | | Update documentation to match change in #5942 [ci skip]
| * Update documentation to match change in #5942 [ci skip]edogawaconan2014-08-241-1/+1
| |
* | Merge pull request #16715 from y-yagi/update_4_2_release_notesZachary Scott2014-08-271-1/+1
|\ \ | | | | | | [ci skip] Modify a web-console PR link for release noted
| * | [ci skip] Modify a web-console PR linkyuuji.yaginuma2014-08-271-1/+1
|/ /
* | Merge pull request #16713 from tomkadwill/documented_eqls_other_paramZachary Scott2014-08-271-1/+1
|\ \ | | | | | | [ci skip] Updated documentation syntax of other parameter for rdoc
| * | [ci skip] Updated documentation syntax of other parameter for rdocTom Kadwill2014-08-271-1/+1
|/ /
* | Merge pull request #16708 from zzak/bcjordan-patch-1Zachary Scott2014-08-261-16/+16
|\ \ | | | | | | Adjusted punctuation and grammar for Form Helpers guide [ci skip]
| * | Adjusted punctuation and grammar for Form Helpers guide [ci skip]Brian Jordan2014-08-261-16/+16
|/ /
* | Merge pull request #16705 from tomkadwill/documented_many_block_paramZachary Scott2014-08-261-1/+1
|\ \ | | | | | | [ci skip] Updated documentation syntax of block parameter for rdoc
| * | [ci skip] Updated documentation syntax of block parameter for rdoc Tom Kadwill2014-08-261-1/+1
| | |
* | | Merge pull request #16706 from tomkadwill/documented_include_record_paramZachary Scott2014-08-261-1/+1
|\ \ \ | | | | | | | | [ci skip] Updated include to reference record parameter for rdoc
| * | | [ci skip] Updated include to reference record parameter for rdocTom Kadwill2014-08-261-1/+1
|/ / /
* | | Merge pull request #16703 from tomkadwill/documented_any_block_paramZachary Scott2014-08-261-1/+1
|\| | | | | | | | [ci skip] Updated documentation syntax of block parameter for rdoc
| * | [ci skip] Updated documentation syntax of block parameter for rdocTom Kadwill2014-08-261-1/+1
|/ /
* | Merge pull request #16700 from seuros/autoloadRafael Mendonça França2014-08-263-2/+18
|\ \ | | | | | | [ActiveJob] Autoload adapters
| * | [ActiveJob] Autoload adaptersAbdelkader Boudih2014-08-263-2/+18
| | |
* | | Merge pull request #16613 from splattael/masterMatthew Draper2014-08-271-7/+10
|\ \ \ | | | | | | | | | | | | Speed up JRuby tests by improving the startup time
| * | | Speed up JRuby tests by improving its startup timePeter Suschlik2014-08-251-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 fetchMatthew Draper2014-08-271-1/+1
| |/ / |/| | | | | | | | Otherwise, it's possible for GC to run in between, and fail the test.
* | | Merge pull request #16697 from ↵Zachary Scott2014-08-261-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 parameterTom Kadwill2014-08-261-0/+15
|/ / /
* | | Merge pull request #16646 from sgrif/sg-perf-regressionJeremy Kemper2014-08-251-1/+20
|\ \ \ | | | | | | | | Cache the value of `changed_attributes` when calling `changes_applied`
| * | | Cache the value of `changed_attributes` when calling `changes_applied`Sean Griffin2014-08-221-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 cachingGodfrey Chan2014-08-252-0/+26
| | | |
* | | | Fixed find_by("sql fragment without bindings") on masterGodfrey Chan2014-08-254-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-1Rafael Mendonça França2014-08-251-1/+1
|\ \ \ \ | | | | | | | | | | Added web links
| * | | | Added web linksEric Brooke2014-08-251-1/+1
|/ / / / | | | | | | | | Added web links to resque, delayed_job and sidekiq
* | | | Merge pull request #16689 from ankit1910/improve-englishEileen M. Uchitelle2014-08-251-2/+2
|\ \ \ \ | | | | | | | | | | [ci skip] make assert messages consistent
| * | | | [ci skip] make assert messages consistentankit19102014-08-251-2/+2
| | | | |
* | | | | Merge pull request #16682 from untidy-hair/use_activesupport_concernJeremy Kemper2014-08-251-7/+7
|\ \ \ \ \ | | | | | | | | | | | | Use ActiveSupport::Concern
| * | | | | Use ActiveSupport::Concern instead of the traditinal wayYukio Mizuta2014-08-251-7/+7
| | | | | |
* | | | | | Quick pass through the 4.2 release notes [ci skip]Robin Dupret2014-08-251-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-aporstropheRafael Mendonça França2014-08-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] use proper apostrophe
| * | | | | | [ci skip] use proper apostropheankit19102014-08-251-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #16488 from agrobbin/form-label-builderJeremy Kemper2014-08-253-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 contentAlex Robbin2014-08-203-22/+62
| | | | | |
* | | | | | pg, `default_sequence_name` needs to return a string.Yves Senn2014-08-253-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/masterJeremy Kemper2014-08-241-0/+1
|\ \ \ \ \ | | | | | | | | | | | | [ActiveJob] Add activesupport as dependency [ci skip]
| * | | | | [ActiveJob] Add activesupport as dependency [ci skip]Abdelkader Boudih2014-08-241-0/+1
| | | | | |
* | | | | | Merge pull request #16639 from agrobbin/input-placeholder-i18nJeremy Kemper2014-08-245-0/+231
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add I18n support for `:placeholder` HTML option is passed to form fields
| * | | | | | just use the placeholder tag value if it is passed as a StringAlex Robbin2014-08-222-5/+22
| | | | | | |
| * | | | | | add I18n support for `:placeholder` HTML option is passed to form fieldsAlex Robbin2014-08-225-0/+214
| | | | | | |
* | | | | | | Merge pull request #16662 from robin850/duration-instance-ofJeremy Kemper2014-08-243-9/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix `ActiveSupport::Duration#instance_of?` to behave like `#is_a?`
| * | | | | | | Skip #eql? tests on Rubinius for AS::DurationRobin Dupret2014-08-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Rubinius is relying on #instance_of? for its definition of #eql? (http://git.io/MtmbbA) but ActiveSupport::Duration should behave like is_a? it returns true with `Fixnum`. Thus, for the moment, the last assertion is failing so we have to skip this test.
| * | | | | | | Follow-up to #16560Robin Dupret2014-08-243-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the sake of backward-compatibility, we need to make #instance_of? return true for Fixnum. On the other hand, the method should still give true for ActiveSupport::Duration itself which was not the case before.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 12:24:55 +0000