aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #29158 from ffmike/add-json-feedAndrew White2017-05-205-7/+14
|\ | | | | Add :json type to auto_discovery_link_tag
| * Add :json type to auto_discovery_link_tagMike Gunderloy2017-05-205-7/+14
| | | | | | | | | | This allows auto_discovery_link_tag to support the JSON Feed standard. See https://jsonfeed.org/version/1 for more information.
* | Unused variableDavid Heinemeier Hansson2017-05-201-1/+0
|/
* Merge pull request #29153 from kamipo/fix_warning_assigned_but_unused_variableKasper Timm Hansen2017-05-201-1/+1
|\ | | | | Fix `warning: assigned but unused variable - timestamp`
| * Fix `warning: assigned but unused variable - timestamp`Ryuta Kamizono2017-05-201-1/+1
|/
* Merge pull request #29134 from joshaidan/document-action-nameAlex Kitchens2017-05-191-0/+8
|\ | | | | Add documentation to accessors in AbstractController::Base
| * Clarified description of formats [ci skip]Brian Jones2017-05-191-1/+1
| |
| * Added missing punctuation [ci skip]Brian Jones2017-05-181-3/+3
| |
| * Specify only the body of the response is returned [ci skip]Brian Jones2017-05-181-1/+1
| |
| * Document accessors response_body, action_name, formats [ci skip]Brian Jones2017-05-171-0/+8
| |
* | Merge pull request #29057 from ↵Akira Matsuda2017-05-192-2/+2
|\ \ | | | | | | | | | | | | koic/suppress_warning_assigned_but_unused_variable Suppress `warning: assigned but unused variable - stdout`
| * | Suppress `warning: assigned but unused variable - stdout`Koichi ITO2017-05-122-2/+2
| | |
* | | Add cache_key_with_version and use it in ActiveSupport::Cache.expand_cache_keyDavid Heinemeier Hansson2017-05-194-28/+50
| | | | | | | | | | | | | | | | | | This retains the existing behavior of ActiveSupport::Cache.expand_cache_key (as used by etaging) where the cache key includes the version.
* | | ERB::Util.url_encode no longer escapes ~ since ruby 2.5Akira Matsuda2017-05-191-2/+2
| | | | | | | | | | | | see: https://bugs.ruby-lang.org/issues/6696
* | | mathn has been gemified in ruby 2.5Akira Matsuda2017-05-192-0/+6
| | |
* | | bundle mail 2.6.5 that includes fix for ::Fixnum warningAkira Matsuda2017-05-191-1/+1
| | |
* | | Cleanup CHANGELOGs [ci skip]Ryuta Kamizono2017-05-193-18/+18
| | | | | | | | | | | | | | | * Fix indentation. * Add backticks.
* | | Merge pull request #29020 from stevenchanin/masterJon Moss2017-05-181-0/+6
|\ \ \ | | | | | | | | [ci skip] explain async queue and rake tasks
| * | | remove the phrase as wellSteven Chanin2017-05-091-1/+1
| | | | | | | | | | | | | | | | [ci skip]
| * | | Capitalize RakeSteven Chanin2017-05-091-2/+2
| | | |
| * | | [ci skip] explain async queue and rake tasksSteven Chanin2017-05-091-0/+6
| | | | | | | | | | | | | | | | [ci skip]
* | | | Use recyclable cache keys (#29092)David Heinemeier Hansson2017-05-1830-116/+431
| |_|/ |/| |
* | | Merge pull request #29063 from sepehr500/masterRafael França2017-05-172-2/+12
|\ \ \ | | | | | | | | Fixed Frozen string error in actionpack
| * | | Fixed string being modified in place causing frozen string errors in Ruby 2.3sepehr5002017-05-152-2/+12
| | | |
* | | | Merge pull request #29118 from kamipo/remove_respond_to_reset_scopeRafael França2017-05-171-1/+1
|\ \ \ \ | | | | | | | | | | Remove unneeded `association.respond_to?(:reset_scope)`
| * | | | Remove unneeded `association.respond_to?(:reset_scope)`Ryuta Kamizono2017-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Since 86390c3 all associations have `reset_scope` so `respond_to?` is unneeded.
* | | | | Merge pull request #29122 from koic/ci_against_jruby_9_1_9_0Rafael França2017-05-171-3/+3
|\ \ \ \ \ | | | | | | | | | | | | CI against JRuby 9.1.9.0
| * | | | | CI against JRuby 9.1.9.0Koichi ITO2017-05-171-3/+3
|/ / / / / | | | | | | | | | | | | | | | http://jruby.org/2017/05/16/jruby-9-1-9-0
* | | | | Merge pull request #29117 from yahonda/another_29021Rafael Mendonça França2017-05-161-23/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Set non 0 value to logger not to be affected by Ruby versions
| * | | | | Set non 0 value to logger not to be affected by Ruby versionsYasuo Honda2017-05-171-23/+23
| |/ / / / | | | | | | | | | | | | | | | Addresses #29021
* | | | | Merge pull request #29089 from yahonda/address_29021Rafael França2017-05-161-9/+9
|\ \ \ \ \ | |/ / / / |/| | | | Address LogSubscriberTest failures to support Rails 2.5.0-dev
| * | | | Address LogSubscriberTest failures to support Rails 2.5.0-devYasuo Honda2017-05-161-9/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Address #29021 Since Ruby 2.5.0-dev does not return decimal value when it is 0. This change has been made at Ruby 2.5.0-dev between `(2017-05-05 trunk 58572)` and `(2017-05-07 trunk 58586)`, likely Revision 58586. This fix has been tested with these Ruby versions: * ruby 2.5.0dev (2017-05-15 trunk 58733) [x86_64-linux] * ruby 2.4.1p111 (2017-03-22 revision 58053) [x86_64-linux] * ruby 2.3.4p301 (2017-03-30 revision 58214) [x86_64-linux] * ruby 2.2.7p470 (2017-03-28 revision 58194) [x86_64-linux] [Yasuo Honda & Ryuta Kamizono]
* | | | Fix association documentationRafael Mendonça França2017-05-161-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The object inside the scope is of the class that define the association not the associated class. [ci skip]
* | | | Merge pull request #29056 from ↵Andrew White2017-05-161-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | juliusdelta/29055-missing-links-in-activesupport-railsguide Added fixed links to code for Rails Guides ActiveSupport
| * | | Old expression caught to many chars resulting in 404. Added minor change to ↵JD Gonzales2017-05-121-1/+1
| | | | | | | | | | | | | | | | resolve
* | | | Merge pull request #29095 from y-yagi/fix_test_with_rack_203Guillermo Iguaran2017-05-152-7/+7
|\ \ \ \ | | | | | | | | | | Fix `TestInvalidUrls` with rack 2.0.3
| * | | | Fix `TestInvalidUrls` with rack 2.0.3yuuji.yaginuma2017-05-161-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, raise `BadRequest` if params encoding is invalid. https://github.com/rails/rails/blob/5-1-stable/actionpack/lib/action_dispatch/http/parameters.rb#L64..L74 https://github.com/rails/rails/blob/5-1-stable/actionpack/lib/action_dispatch/request/utils.rb#L26..L39 However, env values are ensure encoded in ASCII 8 BIT at rack 2.0.3. https://github.com/rack/rack/commit/68db9aa99e3e2775a58621f658b2a7a0f67db459 Therefore, even if specify an invalid urls, it will not cause an error.
| * | | | Bump rack versionyuuji.yaginuma2017-05-161-1/+1
| | | | |
* | | | | Merge pull request #29077 from rails/ignore-tables-in-sql-dumpGuillermo Iguaran2017-05-158-5/+85
|\ \ \ \ \ | |/ / / / |/| | | | Respect 'SchemaDumper.ignore_tables' in databases structure dump
| * | | | Changelog entry [ci-skip]Guillermo Iguaran2017-05-151-0/+4
| | | | |
| * | | | Improvements for SQLite rake task.Guillermo Iguaran2017-05-151-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use NOT IN in SQL query * Quote table names propertly * Use array form of command invocation
| * | | | Update SchemaDumper.ignore_tables docsGuillermo Iguaran2017-05-151-2/+2
| | | | |
| * | | | Respect 'ignore_tables' in SQLite structure dumpGuillermo Iguaran2017-05-152-1/+30
| | | | |
| * | | | Respect 'ignore_tables' in MySQL structure dumpGuillermo Iguaran2017-05-152-0/+22
| | | | |
| * | | | Respect `ignore_tables` in Postgres structure dumpRusty Geldmacher2017-05-152-0/+14
|/ / / / | | | | | | | | | | | | | | | | | | | | When using `sql` as the schema format, or even just doing `rake db:structure:dump`, it would be good to respect the list of ignored tables that has been configured.
* | | | Merge pull request #29086 from mikeycgto/message-encryptor-auth-tag-checkKasper Timm Hansen2017-05-152-8/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Message encryptor auth tag check Fixes MessageEncryptor when used in AEAD mode. Specifically, we need to check if the `auth_tag` is nil. This may arise when an AEAD encryptor is used to decrypt a ciphertext generated from a different mode, such as CBC-HMAC. Basically, the number of double dashes will differ and `auth_tag` may be nil in this case.
| * | | | Updates to MessageEncryptor AEAD testsMichael Coyne2017-05-151-10/+14
| | | | |
| * | | | Fix for AEAD auth_tag check in MessageEncryptorMichael Coyne2017-05-152-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When MessageEncryptor tries to +decrypt_and_verify+ ciphertexts generated in a different mode (such CBC-HMAC), the +auth_tag+ may be +nil+ and must explicitly check for it. See the discussion here: https://github.com/rails/rails/pull/28132#discussion_r116388462
* | | | | Merge pull request #29083 from eugeneius/local_cache_unless_existEileen M. Uchitelle2017-05-152-1/+14
|\ \ \ \ \ | | | | | | | | | | | | Don't cache locally if unless_exist was passed
| * | | | | Don't cache locally if unless_exist was passedEugene Kenny2017-05-142-1/+14
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some cache backends support the `unless_exist` option, which tells them not to overwrite an existing entry. The local cache currently always stores the new value, even though the backend may have rejected it. Since we can't tell which value will end up in the backend cache, we should delete the key from the local cache, so that the next read for that key will go to the backend and pick up the correct value.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 14:54:55 +0000