aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* `number_to_phone` formats number with regexpPan GaoYong2016-04-025-4/+36
| | | | | | | | | | | | By default, this method formats US number. This commit extends its functionality to format number for other countries with a custom regular expression. number_to_phone(18812345678, pattern: /(\d{3})(\d{4})(\d{4})/) # => 188-1234-5678 The output phone number is divided into three groups, so the regexp should also match three groups of numbers.
* Merge pull request #24400 from utilum/Grammer_fix_in_commentVipul A M2016-04-021-1/+1
|\ | | | | Grammer fix in comment: capitalize first word in sentence [ci skip].
| * Grammer fix in comment: capitalize first word in sentence [ci skip].utilum2016-04-021-1/+1
|/
* Merge pull request #24387 from jeremy/strong-etagJeremy Daer2016-04-016-63/+210
|\ | | | | Strong ETag validators
| * Strong ETag validatorsJeremy Daer2016-03-316-63/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduce `Response#strong_etag=` and `#weak_etag=` and analogous options for `fresh_when` and `stale?`. `Response#etag=` sets a weak ETag. Strong ETags are desirable when you're serving byte-for-byte identical responses that support Range requests, like PDFs or videos (typically done by reproxying the response from a backend storage service). Also desirable when fronted by some CDNs that support strong ETags only, like Akamai. * No longer strips quotes (`"`) from ETag values before comparing them. Quotes are significant, part of the ETag. A quoted ETag and an unquoted one are not the same entity. * Support `If-None-Match: *`. Rarely useful for GET requests; meant to provide some optimistic concurrency control for PUT requests.
* | Merge pull request #24388 from javiervidal/20160331Arun Agrawal2016-04-011-1/+1
|\ \ | |/ |/| Fixes broken link in 'Ruby on Rails 2.2 Release Notes'
| * Fixes broken link in 'Ruby on Rails 2.2 Release Notes' [ci skip]Javier Vidal2016-04-011-1/+1
|/
* Merge pull request #24379 from Gaurav2728/sanitizer-helper-update-docKasper Timm Hansen2016-03-311-1/+1
|\ | | | | sanitiser helper may be remove in 5.1, update doc [ci skip]
| * 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
* | Revert "Deprecate table names containing dots"Sean Griffin2016-03-312-15/+0
| | | | | | | | | | | | This reverts commit 7b82e1c77b48cb351da4e0ed6ea0bac806d4925c. This would have removed the ability to reference a schema when using PG
* | Merge pull request #24377 from bogdanvlviv/fix_upcase_firstRafael França2016-03-314-4/+16
|\ \ | | | | | | Fix method String#upcase_first
| * | Fix method String#upcase_firstbogdanvlviv2016-03-314-4/+16
| |/
* | Merge pull request #23658 from ↵Rafael França2016-03-317-19/+20
|\ \ | | | | | | | | | | | | kamipo/move_quoted_names_cache_up_to_abstract_adapter Move `@quoted_{column|table}_names` cache up to the abstract adapter
| * | Move `@quoted_{column|table}_names` cache up to the abstract adapterRyuta Kamizono2016-03-317-19/+20
| |/
* | Merge pull request #24385 from morgoth/deprecate-datetime_field_tagRafael França2016-03-315-9/+41
|\ \ | | | | | | Deprecate `datetime_field` and `datetime_field_tag` helpers.
| * | Deprecate `datetime_field` and `datetime_field_tag` helpers.Wojciech Wnętrzak2016-03-315-9/+41
| |/ | | | | | | | | Datetime input type was removed from HTML specification. One can use `datetime_local_field` and `datetime_local_field_tag` instead.
* | Prepared statements shouldn't share a cache with unprepared statementsSean Griffin2016-03-312-3/+16
| | | | | | | | | | | | | | | | | | When prepared statements are enabled, the statement cache caches the SQL directly, including the bind parameters. If a similar query is run later with prepared statements disabled, we need to use a separate cache instead of trying to share the same one. Fixes #24351
* | Deprecate table names containing dotsSean Griffin2016-03-312-0/+15
| | | | | | | | | | | | | | | | Dots have special meaning in most backends (e.g. everything except SQLite3), as well as most methods that work with table or column names. This isn't something that we ever explicitly supported, but there's at least one case of somebody using this (see #24367), so we'll go through a deprecation cycle as normal.
* | Ensure associations still work when the table name contains a dotSean Griffin2016-03-313-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue occured because associations now call `where` directly, and a dot in the key name for `where` means nested tables. For this fix, we now pass the table name as a symbol, and do not attempt to expand symbols containing a dot. This is a temporary fix. I do not think we should support table names containing a dot, as it has a special meaning in most backends, as well as most APIs that involve table names. This commit does not include a test, as I am going to deprecate table names containing dots in the following commit. Fixes #24367
* | Merge pull request #24381 from Tensho/filter-parameters-partial-matchRafael França2016-03-313-1/+5
|\ \ | | | | | | [ci skip] Parameters filter performs regular expression partial matching
| * | [ci skip] Parameter filter performs regular expression partial matchingAndrew Babichev2016-03-313-1/+5
|/ /
* | Merge pull request #24233 from jeremy/cable/encodingJeremy Daer2016-03-3118-154/+245
|\ \ | | | | | | Cable message encoding
| * | Cable message encodingJeremy Daer2016-03-3118-154/+245
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduce a connection coder responsible for encoding Cable messages as WebSocket messages, defaulting to `ActiveSupport::JSON` and duck- typing to any object responding to `#encode` and `#decode`. * Consolidate encoding responsibility to the connection. No longer explicitly JSON-encode from channels or other sources. Pass Cable messages as Hashes to `#transmit` and rely on it to encode. * Introduce stream encoders responsible for decoding pubsub messages. Preserve the currently raw encoding, but make it easy to use JSON. Same duck type as the connection encoder. * Revert recent data normalization/quoting (#23649) which treated `identifier` and `data` values as nested JSON objects rather than as opaque JSON-encoded strings. That dealt us an awkward hand where we'd decode JSON strings… or not, but always encode as JSON. Embedding JSON object values directly is preferably, no extra JSON encoding, but that should be a purposeful protocol version change rather than ambiguously, inadvertently supporting multiple message formats.
* | Merge pull request #24376 from jeremy/cable/downsize-worker-pool-default-sizeJeremy Daer2016-03-312-2/+12
|\ \ | |/ |/| Cable: reconcile default worker pool size with low db conn pool size
| * Cable: reconcile default worker pool size with low db conn pool sizeJeremy Daer2016-03-302-2/+12
| | | | | | | | | | | | | | | | | | | | | | Whack it down from 100 to 4. Large worker pools means large db connection counts. We aren't set up for that by default and most apps won't need it out of the box. We're better off tuning the default worker pool for low traffic, low resource consumption apps. Those who have higher traffic will scale up to meet demand.
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 10:49:56 +0000