aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* sanitiser helper may be remove in 5.1, update doc [ci skip]Gaurav Sharma2016-03-311-1/+1
| | | using `rails-html-sanitizer` gem still Rails providing strip_tags, strip_links features. May be remove in 5.1
* Merge pull request #24368 from kamipo/make_to_private_the_visibilitySean Griffin2016-03-304-32/+54
|\ | | | | Make to private the visibility of `_quote` and `_type_cast`
| * Make to private the visibility of `_quote` and `_type_cast`Ryuta Kamizono2016-03-304-32/+54
| |
* | Merge pull request #24373 from silatham99/remove-meth-from-railsJon Moss2016-03-301-3/+3
|\ \ | | | | | | Replace _meth with _method to remove ambiguity
| * | Replace _meth with _method to remove ambiguityScott Latham2016-03-301-3/+3
|/ / | | | | | | [ci skip]
* | Merge pull request #24371 from yui-knk/update_gemfile_lockRafael França2016-03-301-1/+1
|\ \ | | | | | | Update Gemfile.lock
| * | Update Gemfile.lockyui-knk2016-03-311-1/+1
| | | | | | | | | | | | | | | 'rake' gem is bundled to '>= 11.1' by 30279704646fff33e64c71ee3c4de34bf75232c4 (#23499), but it seems the commit did not fully include Gemfile.lock's.
* | | Merge pull request #24370 from yui-knk/suppress_warningsRafael França2016-03-302-6/+12
|\ \ \ | |/ / |/| | Suppress warnings
| * | Suppress warningsyui-knk2016-03-312-6/+12
|/ / | | | | | | | | "Using a dynamic :controller (or :action) segment in a route is deprecated" by 6520ea5f7e2215a763ca74bf6cfa87be2347d5df (#23980).
* | Merge pull request #24356 from denofevil/fixture_filenameRafael França2016-03-302-1/+13
|\ \ | | | | | | provide file name for fixture ERB
| * | provide file name for fixture ERBDennis Ushakov2016-03-302-1/+13
| | |
* | | Merge pull request #23499 from bf4/ci_one_jrubyRafael França2016-03-303-2/+9
|\ \ \ | | | | | | | | Run one JRuby worker on CI; allow to fail
| * | | Run latest precompiled JRuby on CI only against ActionPackBenjamin Fleischer2016-03-303-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses latest precompiled JRuby so that we don't spend time downloading versions Travis has not already compiled. http://rubies.travis-ci.org/ Uses latest jdk: oraclejdk8 per https://docs.travis-ci.com/user/build-environment-updates/2015-02-03/#Ruby-VM and https://docs.travis-ci.com/user/languages/ruby/#Supported-Ruby-Versions-and-RVM Follows on work in https://github.com/rails/rails/pull/23927 which was reverted https://github.com/rails/rails/commit/26fe5fa08d52384bcea09c4210e3b3baaf5e9b95 JRUBY_OPTS minimize GC, disable JIT, for max test speed - https://github.com/rails/rails/pull/16613 - https://github.com/rails/rails/pull/17088 Have Rails use JRuby-compatible Rake 11.1 - The Rake task was passing --verbose, an invalid option, to contemporary JRuby - https://github.com/ruby/rake/pull/120 - https://github.com/rails-api/active_model_serializers/pull/1585 - https://github.com/jruby/jruby/issues/3653#issuecomment-195883717 No advantage to directly mounting JRuby over installing from cache; both on S3 - https://github.com/rails/rails/pull/23499/commits/b2d5b336b5a812009444571b22eed90777cd9a8c - https://github.com/rails/rails/pull/23499/commits/f4fad041b2755d81e82ee3fc66d96f334b4653db
* | | | Merge pull request #24366 from prathamesh-sonpatki/changelog-passRafael França2016-03-302-5/+3
|\ \ \ \ | | | | | | | | | | Pass over CHANGELOGs [ci skip]
| * | | | Pass over CHANGELOGs [ci skip]Prathamesh Sonpatki2016-03-302-5/+3
|/ / / /
* | | | 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]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 12:06:32 +0000