aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CHANGELOG & improvements to #16649Godfrey Chan2014-08-232-2/+9
| | | | | * Require either FIRST or LAST qualifier for "NULLS ..." * Require whitespace before "NULLS ..."
* Merge pull request #16649 from Agis-/pg-columns-for-distinctGodfrey Chan2014-08-232-1/+10
|\ | | | | | | Fix postgresql adapter #columns_for_distinct trimming whitespace it shouldn't
| * Don't trim excess whitespace in pg #columns_for_distinctAgis-2014-08-242-1/+10
|/ | | | Fixes #16623 introduced by https://github.com/rails/rails/commit/3d5a2019bcccc6fb01bee4811ca669f4383edb51
* Merge pull request #16659 from y-yagi/patch-4Vijay Dev2014-08-231-1/+1
|\ | | | | Fix example code in Active Job guide [ci skip]
| * Fix example code in Active Job guide [ci skip]yuuji.yaginuma2014-08-231-1/+1
|/
* Merge pull request #16655 from brocktimus/20140823_doco_changeZachary Scott2014-08-231-1/+1
|\ | | | | Correct AR::RecordNotFound in AJ guide rescue example [ci skip]
| * Properly referencing AR::RecordNotFound in AJ guide rescuing exampleBrock Trappitt2014-08-231-1/+1
| |
* | Merge pull request #16650 from zzak/fix-precision-number_to_rounded_converterZachary Scott2014-08-221-1/+1
|\ \ | | | | | | Use zero-padding for number_to_rounded_converter
| * | Use zero-padding for number_to_rounded_converterZachary Scott2014-08-221-1/+1
| | |
* | | Merge pull request #16647 from tjschuck/form_for_doc_optionsRafael Mendonça França2014-08-221-1/+1
|\ \ \ | | | | | | | | Documentation update for form_for options
| * | | Remove erroneous form_tag option docsT.J. Schuck2014-08-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is true of the first param (url_for_options), not of the second options param which is being documented here. [ci skip]
| * | | Clarify that unknown keys will become HTML attrsT.J. Schuck2014-08-221-0/+1
| |/ / | | | | | | | | | | | | | | | Docs for all the other form tag helpers in this file already clarify this. [ci skip]
* | | Merge pull request #16602 from thetron/active_job_que_enqueue_at_supportRafael Mendonça França2014-08-223-1/+12
|\ \ \ | | | | | | | | Added enqueue_at support for QueAdapter in ActiveJob
| * | | Added enqueue_at support for QueAdapter in ActiveJobNicholas Bruning2014-08-213-1/+12
| | | | | | | | | | | | | | | | | | | | * Added inline job runner for Que in test/support * Updated QueAdapter to support enqueue_at
* | | | Merge pull request #16648 from seuros/masterRafael Mendonça França2014-08-223-2/+26
|\ \ \ \ | | | | | | | | | | [ActiveJob] Add hook for test_framework
| * | | | [ActiveJob] Add hook for test_framework and test templatesAbdelkader Boudih2014-08-223-2/+26
|/ / / /
* | | | Merge pull request #16598 from seuros/masterMatthew Draper2014-08-231-0/+1
|\ \ \ \ | | | | | | | | | | [ActionMailer] require activejob railtie
| * | | | [ActionMailer] require activejob railtieAbdelkader Boudih2014-08-221-0/+1
| | | | |
* | | | | Merge pull request #15932 from joseluistorres/issue-11957-uuidsRafael Mendonça França2014-08-223-1/+17
|\ \ \ \ \ | | | | | | | | | | | | adding the exception RecordNotFound to UUID find #11957
| * | | | | adding the exception RecordNotFound to UUID findJoseLuis Torres2014-08-213-1/+17
| | |/ / / | |/| | |
* | | | | Merge pull request #16645 from sgrif/sg-perf-regressionRafael Mendonça França2014-08-221-8/+0
|\ \ \ \ \ | | | | | | | | | | | | Don't calculate in-place changes twice
| * | | | | Don't calculate in-place changes twiceSean Griffin2014-08-221-8/+0
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Now that `changed_attributes` includes in place changes, we don't need to override these methods in Active Record. Partially fixes the performance regression caused by #16189
* | | | | Merge pull request #16641 from cristianbica/aj-backburner-enqueue-laterRafael Mendonça França2014-08-222-5/+6
|\ \ \ \ \ | | | | | | | | | | | | Implemented enqueue_at for ActiveJob's Backburner adapter
| * | | | | Implemented enqueue_at for ActiveJob's Backburner adapterCristian Bica2014-08-222-5/+6
| | | | | |
* | | | | | Merge pull request #16642 from cristianbica/aj-doc-queue-name-prefixZachary Scott2014-08-221-2/+23
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Active Job Guide: Example of config queue_name_prefix [ci skip]
| * | | | | Active Job guide: Add info about queue_name prefix and clarity supporter ↵Cristian Bica2014-08-221-2/+23
| |/ / / / | | | | | | | | | | | | | | | features
* | | | | Merge pull request #16622 from matthewd/default-debugMatthew Draper2014-08-232-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Don't fight against ourselves for the default log level
| * | | | | Don't fight against ourselves for the default log levelMatthew Draper2014-08-222-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we want to always default to :debug, let's just do that. At which point the production.rb entry can become an "uncomment to change" instead.
* | | | | | Merge pull request #16626 from adomokos/replacing-each-with-reduceSantiago Pastorino2014-08-221-3/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Replacing an each with reduce
| * | | | | Using `each_with_object` instead of `reduce`Attila Domokos2014-08-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way no new object allocation is taking place. Thanks @jeremy for the suggestion!
| * | | | | Replacing an each with reduceAttila Domokos2014-08-211-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functionality has not changed, but the code is more elegant by using `reduce` instead of `each`. This way no accumulator needs to be declared, no explicit return is needed.
* | | | | | Merge pull request #16560 from robin850/rbx-duration-eqlRafael Mendonça França2014-08-223-2/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Define the Duration#instance_of? method
| * | | | | | Define the Duration#instance_of? methodRobin Dupret2014-08-183-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Duration is extending from ProxyObject which extends itself from BasicObject, the Duration object doesn't respond to the #instance_of? method. Thus, the #method_missing hook get triggered, delegating the method to its `value` attribute. However, Rubinius' #eql? definition relies on #instance_of?, thus this will equal to true with a Fixnum (since its `value` attribute is a Fixnum) while it should not. The previous behavior was wrong anyway, no matter the implementation.
* | | | | | | Merge pull request #16633 from tgxworld/prefer_log_message_through_blockYves Senn2014-08-221-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Pass logging message through block.
| * | | | | | | Pass logging message through block.Guo Xiang Tan2014-08-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This follows the good practice listed on http://guides.rubyonrails.org/debugging_rails_applications.html#impact-of-logs-on-performance
* | | | | | | | Merge pull request #16634 from tgxworld/missing_spaceZachary Scott2014-08-221-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Missing space. [CI SKIP]
| * | | | | | | Missing space. [CI SKIP]Guo Xiang Tan2014-08-221-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #11859 from zzak/nested_model_forms_guideZachary Scott2014-08-221-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | See AR::Associations for greater detail in Nested Model Forms Guide [ci skip]
| * | | | | | | add nested_model_forms to guides/documents.yaml [wip] [ci skip]Zachary Scott2014-08-221-1/+4
|/ / / / / / /
* | | | | | | Merge branch 'jonatack-patch-8'Zachary Scott2014-08-221-2/+6
|\ \ \ \ \ \ \
| * | | | | | | Follow up on #16408Jon Atack2014-08-221-2/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | | [ci skip] Running AR tests guide [Fixes GH-15891]Zachary Scott2014-08-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch by @bcjordan
* | | | | | | Merge pull request #16630 from ↵Zachary Scott2014-08-221-0/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tomkadwill/added_has_and_belongs_to_many_scope_documentation [ci skip] Added documentation for has_and_belongs_to_many scope parameter
| * | | | | | | [ci skip] Added documentation for has_and_belongs_to_many scope parameterTom Kadwill2014-08-221-0/+12
|/ / / / / / /
* | | | | | | Merge pull request #16629 from rails/revert-16438-input-placeholder-i18nJeremy Kemper2014-08-215-214/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Revert "Add I18n support for `:placeholder` HTML option is passed to for...
| * | | | | | | Revert "Add I18n support for `:placeholder` HTML option is passed to form ↵Jeremy Kemper2014-08-215-214/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | fields"
* | | | | | | Merge pull request #16604 from saarons/clean-remote-ip-middlewareJeremy Kemper2014-08-213-53/+61
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | ActionDispatch::RemoteIp accept IPAddr matches for trusted proxies
| * | | | | | | Refactor ActionDispatch::RemoteIpSam Aarons2014-08-213-53/+61
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored IP address checking in ActionDispatch::RemoteIp to rely on the IPAddr class instead of the unwieldly regular expression to match IP addresses. This commit keeps the same api but allows users to pass IPAddr objects to config.action_dispatch.trusted_proxies in addition to passing strings and regular expressions. Example: # config/environments/production.rb config.action_dispatch.trusted_proxies = IPAddr.new('4.8.15.0/16')
* | | | | | | fix grammar [ci skip]Vijay Dev2014-08-221-1/+1
| | | | | | |
* | | | | | | fix server names [ci skip]Vijay Dev2014-08-221-1/+1
|/ / / / / / | | | | | | | | | | | | Per feedback in https://github.com/rails/rails/commit/af63e4a2546629c3fb2d53cffb7d4ea0e8663f68#commitcomment-7477636
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 10:00:28 +0000