aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #24331 from prathamesh-sonpatki/fix-puma-restartRafael França2016-03-307-1/+45
|\ \ \ \ \ | | | | | | | | | | | | Fix rails restart issue with Puma
| * | | | | Fix rails restart issue with PumaPrathamesh Sonpatki2016-03-307-1/+45
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We need to pass the restart command to Puma so that it will use it while restarting the server. - Also made sure that all the options passed by user while starting the server are used in the generated restart command so that they will be used while restarting the server. - Besides that we need to remove the server.pid file for the previous running server because otherwise Rack complains about it's presence. - We don't care if the server.pid file does not exist. We only want to delete it if it exists. - This also requires some changes on Puma side which are being tracked here - https://github.com/puma/puma/pull/936. - Fixes #23910.
* | | | | Merge pull request #24365 from prathamesh-sonpatki/fix-deprecation-warningRafael França2016-03-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix deprecation warning for ParamsParser instance :smile:
| * | | | | Fix deprecation warning for ParamsParser instance :smile:Prathamesh Sonpatki2016-03-301-1/+1
|/ / / / /
* | | | | Deprecate ActionDispatch::ParamsParser instance.Rafael Mendonça França2016-03-302-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related with 38d2bf5fd1f3e014f2397898d371c339baa627b1. cc @tenderlove
* | | | | Merge pull request #23895 from glaucocustodio/add_upcase_first_methodRafael Mendonça França2016-03-304-0/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Add upcase_first method
| * | | | | Add upcase_first methodGlauco Custódio2016-02-254-0/+22
| | | | | |
* | | | | | Fix CHANGELOG entry [ci skip]Rafael Mendonça França2016-03-301-1/+1
| | | | | |
* | | | | | Merge branch 'actioncable-notifications'Rafael Mendonça França2016-03-303-5/+97
|\ \ \ \ \ \
| * | | | | | Keep logging in the ActionCable::Channel::BaseRafael Mendonça França2016-03-303-110/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To move Action Cable logging to a LoggingSubscriber we need to pass the log tags in the notification payload since Action Cable logging use the Channel instance to tag the logs.
| * | | | | | Merge pull request #23723 from mwear/action_cable_notificationsRafael Mendonça França2016-03-295-8/+204
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add ActiveSupport::Notification to Channel::Base#perform_action
| | * | | | | | Add AS::Notifications and LogSubscriber to ActionCable::ChannelMatthew Wear2016-03-045-8/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds ActiveSupport::Notifications instrumentation hooks and a LogSuscriber to ActionCable::Channel::Base.
* | | | | | | | Merge pull request #24362 from kamipo/add_test_create_record_with_pk_as_zeroRafael França2016-03-292-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add a test case for create a record with primary key as zero
| * | | | | | | | Add a test case for create a record with primary key as zeroRyuta Kamizono2016-03-302-0/+7
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #24363 from kamipo/remove_except_helper_in_test_schemaRafael França2016-03-291-7/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Remove `except` helper for test schema
| * | | | | | | Remove `except` helper for test schemaRyuta Kamizono2016-03-301-7/+1
| |/ / / / / /
* | | | | | | Merge pull request #24349 from chrisarcand/add-changelog-for-24305Rafael França2016-03-291-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add changelog for #24305
| * | | | | | | Add changelog for #24305 [skip ci]Chris Arcand2016-03-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to add, sigh. Closes #24273
* | | | | | | | Merge pull request #24327 from bogdanvlviv/patch-2Rafael França2016-03-291-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update compatibility.rb
| * | | | | | | | Update compatibility.rbBogdan2016-03-261-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #24350 from y-yagi/update_assert_no_performed_jobs_docVipul A M2016-03-301-18/+5
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | update `assert_no_performed_jobs` doc to use `assert_no_performed_jobs` method [ci skip]
| * | | | | | | | update `assert_no_performed_jobs` doc to use `assert_no_performed_jobs` ↵yuuji.yaginuma2016-03-301-18/+5
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | method [ci skip]
* | | | | | | | Merge pull request #24315 from kenta-s/add_empty_to_finder_methodsAndrew White2016-03-293-1/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Delegate some additional methods in querying.rb
| * | | | | | | | Delegate some additional methods in querying.rbKenta2016-03-303-1/+34
| |/ / / / / / /
* | | | | | | | Merge pull request #24354 from greysteil/fix-typoVipul A M2016-03-291-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix typo in headers comment [ci skip]
| * | | | | | | Fix typo in headers commentGrey Baker2016-03-291-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #24344 from codeodor/patch-1Vipul A M2016-03-281-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Update how to clear the association cache
| * | | | | | | Update how to clear the association cacheSammy Larbi2016-03-281-2/+2
|/ / / / / / / | | | | | | | | | | | | | | Passing `true` to the association has been deprecated.
* | | | | | | Merge pull request #24343 from arekf/masterप्रथमेश Sonpatki2016-03-281-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update `numericality` validation docs
| * | | | | | | [skip ci] Update `numericality` validation docsArkadiusz Fal2016-03-281-0/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Add `:other_than` option documentation.
* | | | | | | Merge pull request #24325 from ↵Kasper Timm Hansen2016-03-271-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/show_correct_command_name_in_help_of_rails_runner show correct command name in help of rails runner
| * | | | | | | show correct command name in help of rails runneryuuji.yaginuma2016-03-261-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If use rails together with `spring`, `spring` is rewrite `$0` in the interior command name. Therefore, for `$0` correct command name does not appear, `$0` has been modified so that it does not use.
* | | | | | | | Merge pull request #24337 from xw19/realations-properlyVipul A M2016-03-271-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ci skip] relations inside <tt> tag
| * | | | | | | | [ci skip] relations inside <tt> tagSourav Moitra2016-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | s removed objects added
* | | | | | | | | Merge pull request #24328 from bogdanvlviv/patch-3Vipul A M2016-03-271-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix description for method ActiveRecord::ConnectionAdapters::SchemaStatements#add_timestamps [ci skip]
| * | | | | | | | Fix description for method ↵Bogdan2016-03-271-2/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ActiveRecord::ConnectionAdapters::SchemaStatements#add_timestamps [ci skip]
* | | | | | | | Merge pull request #24334 from mabras/masterArun Agrawal2016-03-271-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | remove old-dead link
| * | | | | | | | remove old-dead linkMohamad Abras2016-03-271-1/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #24333 from y-yagi/add_index_errors_option_to_exampleJon Moss2016-03-261-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add `:index_errors` option to example [ci skip]
| * | | | | | | | add `:index_errors` option to example [ci skip]yuuji.yaginuma2016-03-271-2/+2
|/ / / / / / / /
* | | | | | | | Cable: Shush pop warnings when skipping Postgres tests.Kasper Timm Hansen2016-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `skip` raises an exception to abort the execution of the test, so `super` would never be called and thus `@rx_adapter` and `@tx_adapter` would never have been defined at the time of teardown. Define them just before skipping and zap the warnings.
* | | | | | | | Shush up EM::Hiredis when running tests.Kasper Timm Hansen2016-03-261-0/+11
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EM::Hiredis were spewing screenfuls of warnings when running the Action Cable tests. Copied over the technique that shushes up faye-websocket in the client tests, so we can reduce the noise ratio. Note: there's still warnings spewed after tests have finished when EM::Hiredis shuts down. I haven't been able to shush them up yet.
* | | | | | | Merge pull request #24326 from mechanicles/highlight-wordप्रथमेश Sonpatki2016-03-261-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Highlight the dynamic method finder 'find_by_' [ci skip]
| * | | | | | | Highlight the dynamic method finder 'find_by_' [ci skip]Santosh Wadghule2016-03-261-1/+2
| | | | | | | |
* | | | | | | | Merge pull request #24323 from prathamesh-sonpatki/rm-check-for-development.rbMatthew Draper2016-03-261-4/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | development.rb file always exists so we don't need a check for it
| * | | | | | | development.rb file always exists so we don't need a check for itPrathamesh Sonpatki2016-03-261-4/+1
| | | | | | | |
* | | | | | | | Merge pull request #24296 from laurmurclar/patch-1Vipul A M2016-03-251-19/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Correct typos in "Active Record Query Interface" guide
| * | | | | | | Correct typos in "Active Record Query Interface" guideLaura Murphy-Clarkin2016-03-251-19/+19
|/ / / / / / /
* | | | | | | Merge pull request #24299 from kitop/activemodel-errors-include-fixKasper Timm Hansen2016-03-252-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Do not create a hash key when calling ActiveModel::Errors#include?
| * | | | | | | Do not create a hash key when calling ActiveModel::Errors#include?Esteban Pastorino2016-03-242-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: https://github.com/rails/rails/issues/24279 Problem: By doing `record.errors.include? :foo`, it adds a new key to the @messages hash that defaults to an empty array. This happens because of a combination of these 2 commits: https://github.com/rails/rails/commit/b97035df64f5b2f912425c4a7fcb6e6bb3ddab8d (Added in Rails 4.1) and https://github.com/rails/rails/commit/6ec8ba16d85d5feaccb993c9756c1edcbbf0ba13#diff-fdcf8b65b5fb954372c6fe1ddf284c78R76 (Rails 5.0) By adding the default proc that returns an array for non-existing keys, ruby adds that key to the hash. Solution: Change `#include?` to check with `has_key?` and then check if that value is `present?`. Add test case for ActiveModels::Errors#include?
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 06:23:07 +0000