aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* AEAD encrypted cookies and sessionsMichael Coyne2017-05-2210-108/+295
* bundle up sidekiq to the one with safer integration with Rails 5Akira Matsuda2017-05-211-3/+3
* Merge pull request #29166 from kevinhyunilkim/fix_typo_in_guideRyuta Kamizono2017-05-211-1/+1
|\
| * 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`Ryuta Kamizono2017-05-201-3/+5
* | Merge pull request #29162 from ffmike/update-rack-guideVijay Dev2017-05-201-6/+11
|\ \
| * | Update 'Rails on Rack' guide [ci skip]Mike Gunderloy2017-05-201-6/+11
|/ /
* | 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_tagMike Gunderloy2017-05-205-7/+14
* | | 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`Ryuta Kamizono2017-05-201-1/+1
|/
* Merge pull request #29134 from joshaidan/document-action-nameAlex Kitchens2017-05-191-0/+8
|\
| * 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 koic/suppress_warning_assigned_but_unused_vari...Akira Matsuda2017-05-192-2/+2
|\ \
| * | 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
* | | ERB::Util.url_encode no longer escapes ~ since ruby 2.5Akira Matsuda2017-05-191-2/+2
* | | 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
* | | Merge pull request #29020 from stevenchanin/masterJon Moss2017-05-181-0/+6
|\ \ \
| * | | remove the phrase as wellSteven Chanin2017-05-091-1/+1
| * | | Capitalize RakeSteven Chanin2017-05-091-2/+2
| * | | [ci skip] explain async queue and rake tasksSteven Chanin2017-05-091-0/+6
* | | | 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 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)`Ryuta Kamizono2017-05-171-1/+1
* | | | | 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.0Koichi ITO2017-05-171-3/+3
|/ / / / /
* | | | | 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 versionsYasuo Honda2017-05-171-23/+23
| |/ / / /
* | | | | Merge pull request #29089 from yahonda/address_29021Rafael França2017-05-161-9/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Address LogSubscriberTest failures to support Rails 2.5.0-devYasuo Honda2017-05-161-9/+9
| |/ / /
* | | | Fix association documentationRafael Mendonça França2017-05-161-6/+5
* | | | Merge pull request #29056 from juliusdelta/29055-missing-links-in-activesuppo...Andrew White2017-05-161-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Old expression caught to many chars resulting in 404. Added minor change to r...JD Gonzales2017-05-121-1/+1
* | | | Merge pull request #29095 from y-yagi/fix_test_with_rack_203Guillermo Iguaran2017-05-152-7/+7
|\ \ \ \
| * | | | Fix `TestInvalidUrls` with rack 2.0.3yuuji.yaginuma2017-05-161-6/+6
| * | | | Bump rack versionyuuji.yaginuma2017-05-161-1/+1
* | | | | Merge pull request #29077 from rails/ignore-tables-in-sql-dumpGuillermo Iguaran2017-05-158-5/+85
|\ \ \ \ \ | |/ / / / |/| | | |