aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #29178 from simi/patch-1प्रथमेश Sonpatki2017-05-221-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Update test link in ActionView javascripts README.md.
| * | | | | | | | Update test link in ActionView javascripts README.md.Josef Šimánek2017-05-221-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | [ci skip]
* / / / / / / / We always + 1 to __LINE__ when class_evaling with <<Akira Matsuda2017-05-221-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #29173 from ffmike/simplify-getting-startedRobin Dupret2017-05-211-12/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Simplify handling of prerequisites in Getting Started guide [ci skip]
| * | | | | | | Simplify handling of prerequisites in Getting Started guide [ci skip]Mike Gunderloy2017-05-211-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Telling people about prerequisites, and then telling them a page later how to check and install those prerequisites, is confusing. This commit removes the list and just handles the software installation in one place. Fixes #28565
* | | | | | | | Merge pull request #29072 from ↵Robin Dupret2017-05-215-1/+32
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dixpac/dixpac/add_documentation_for_validate_and_callback_order_of_execution Improving docs for callbacks execution order [ci skip]
| * | | | | | | | Improving docs for callbacks execution order [ci skip]dixpac2017-05-215-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When define callbacks latest definition on the same callback/method overwrites previous ones.
* | | | | | | | | Merge pull request #29163 from rails/fix-scalar-duration-calculationAndrew White2017-05-213-6/+91
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix implicit calculations with scalars and durations
| * | | | | | | | | Fix implicit calculations with scalars and durationsAndrew White2017-05-203-6/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously calculations where the scalar is first would be converted to a duration of seconds but this causes issues with dates being converted to times, e.g: Time.zone = "Beijing" # => Asia/Shanghai date = Date.civil(2017, 5, 20) # => Mon, 20 May 2017 2 * 1.day # => 172800 seconds date + 2 * 1.day # => Mon, 22 May 2017 00:00:00 CST +08:00 Now the `ActiveSupport::Duration::Scalar` calculation methods will try to maintain the part structure of the duration where possible, e.g: Time.zone = "Beijing" # => Asia/Shanghai date = Date.civil(2017, 5, 20) # => Mon, 20 May 2017 2 * 1.day # => 2 days date + 2 * 1.day # => Mon, 22 May 2017 Fixes #29160, #28970.
* | | | | | | | | | Merge pull request #29170 from ffmike/remove-obsolete-guidesKasper Timm Hansen2017-05-212-246/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Remove obsolete Guides source files [ci skip]
| * | | | | | | | | Remove obsolete Guides source files [ci skip]Mike Gunderloy2017-05-212-246/+0
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Nested Model Forms guide is out of date, not linked from index, and material is covered in the Form Helpers guide. * Profiling guide was committed as an outline years ago and never actually written.
* | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 16:09:02 +0000