aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #29168 from ffmike/fix-broken-links-guidesप्रथमेश Sonpatki2017-05-211-1/+1
|\ | | | | Fix broken external link in security guide.
| * Fix broken external link in security guide.Mike Gunderloy2017-05-211-1/+1
|/
* bundle up sidekiq to the one with safer integration with Rails 5Akira Matsuda2017-05-211-3/+3
| | | | see: https://github.com/mperham/sidekiq/blob/master/5.0-Upgrade.md
* Merge pull request #29166 from kevinhyunilkim/fix_typo_in_guideRyuta Kamizono2017-05-211-1/+1
|\ | | | | Fix typo in guides [ci skip]
| * Fix typo in guidesKevin Kim2017-05-211-1/+1
|/
* identifiers is already defined via Connection::Identification moduleAkira Matsuda2017-05-211-1/+1
|
* bundle up redis to the one that does not warn about ::Fixnum deprecationAkira Matsuda2017-05-211-2/+2
|
* Merge pull request #29156 from kamipo/make_valid_directions_to_setAndrew White2017-05-201-3/+5
|\ | | | | Make `VALID_DIRECTIONS` to `Set`
| * Make `VALID_DIRECTIONS` to `Set`Ryuta Kamizono2017-05-201-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby require "benchmark/ips" require "set" array = [:asc, :desc, :ASC, :DESC, "asc", "desc", "ASC", "DESC"] set = array.to_set item = "DESC" Benchmark.ips do |x| x.report "array" do array.include?(item) end x.report "set" do set.include?(item) end end ``` ``` % ruby array_vs_set.rb Warming up -------------------------------------- array 188.441k i/100ms set 229.531k i/100ms Calculating ------------------------------------- array 3.508M (± 9.0%) i/s - 17.525M in 5.043058s set 5.134M (± 7.6%) i/s - 25.707M in 5.038921s ```
* | Merge pull request #29162 from ffmike/update-rack-guideVijay Dev2017-05-201-6/+11
|\ \ | | | | | | Update 'Rails on Rack' guide [ci skip]
| * | Update 'Rails on Rack' guide [ci skip]Mike Gunderloy2017-05-201-6/+11
|/ / | | | | | | | | | | * Adjust middlewares list to match current defaults * application.routes runs on application object, not Rails * Add explanation of Sprockets::Rails::QuietAssets
* | Remove unused mismatch payload attributeDavid Heinemeier Hansson2017-05-201-5/+1
| |
* | 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
| | | | |