aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* More friendly exception in nested attributesKir Shatrov2017-05-222-2/+2
* Merge pull request #29178 from simi/patch-1प्रथमेश Sonpatki2017-05-221-1/+1
|\
| * Update test link in ActionView javascripts README.md.Josef Šimánek2017-05-221-1/+1
|/
* We always + 1 to __LINE__ when class_evaling with <<Akira Matsuda2017-05-221-1/+1
* Merge pull request #29173 from ffmike/simplify-getting-startedRobin Dupret2017-05-211-12/+13
|\
| * Simplify handling of prerequisites in Getting Started guide [ci skip]Mike Gunderloy2017-05-211-12/+13
* | Merge pull request #29072 from dixpac/dixpac/add_documentation_for_validate_a...Robin Dupret2017-05-215-1/+32
|\ \
| * | Improving docs for callbacks execution order [ci skip]dixpac2017-05-215-1/+32
* | | Merge pull request #29163 from rails/fix-scalar-duration-calculationAndrew White2017-05-213-6/+91
|\ \ \
| * | | Fix implicit calculations with scalars and durationsAndrew White2017-05-203-6/+91
* | | | Merge pull request #29170 from ffmike/remove-obsolete-guidesKasper Timm Hansen2017-05-212-246/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove obsolete Guides source files [ci skip]Mike Gunderloy2017-05-212-246/+0
* | | | Merge pull request #29168 from ffmike/fix-broken-links-guidesप्रथमेश Sonpatki2017-05-211-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | 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
* | | 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