| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix implicit calculations with scalars and durations | Andrew White | 2017-05-20 | 3 | -6/+91 |
* | Merge pull request #29158 from ffmike/add-json-feed | Andrew White | 2017-05-20 | 5 | -7/+14 |
|\ |
|
| * | Add :json type to auto_discovery_link_tag | Mike Gunderloy | 2017-05-20 | 5 | -7/+14 |
* | | Unused variable | David Heinemeier Hansson | 2017-05-20 | 1 | -1/+0 |
|/ |
|
* | Merge pull request #29153 from kamipo/fix_warning_assigned_but_unused_variable | Kasper Timm Hansen | 2017-05-20 | 1 | -1/+1 |
|\ |
|
| * | Fix `warning: assigned but unused variable - timestamp` | Ryuta Kamizono | 2017-05-20 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #29134 from joshaidan/document-action-name | Alex Kitchens | 2017-05-19 | 1 | -0/+8 |
|\ |
|
| * | Clarified description of formats [ci skip] | Brian Jones | 2017-05-19 | 1 | -1/+1 |
| * | Added missing punctuation [ci skip] | Brian Jones | 2017-05-18 | 1 | -3/+3 |
| * | Specify only the body of the response is returned [ci skip] | Brian Jones | 2017-05-18 | 1 | -1/+1 |
| * | Document accessors response_body, action_name, formats [ci skip] | Brian Jones | 2017-05-17 | 1 | -0/+8 |
* | | Merge pull request #29057 from koic/suppress_warning_assigned_but_unused_vari... | Akira Matsuda | 2017-05-19 | 2 | -2/+2 |
|\ \ |
|
| * | | Suppress `warning: assigned but unused variable - stdout` | Koichi ITO | 2017-05-12 | 2 | -2/+2 |
* | | | Add cache_key_with_version and use it in ActiveSupport::Cache.expand_cache_key | David Heinemeier Hansson | 2017-05-19 | 4 | -28/+50 |
* | | | ERB::Util.url_encode no longer escapes ~ since ruby 2.5 | Akira Matsuda | 2017-05-19 | 1 | -2/+2 |
* | | | mathn has been gemified in ruby 2.5 | Akira Matsuda | 2017-05-19 | 2 | -0/+6 |
* | | | bundle mail 2.6.5 that includes fix for ::Fixnum warning | Akira Matsuda | 2017-05-19 | 1 | -1/+1 |
* | | | Cleanup CHANGELOGs [ci skip] | Ryuta Kamizono | 2017-05-19 | 3 | -18/+18 |
* | | | Merge pull request #29020 from stevenchanin/master | Jon Moss | 2017-05-18 | 1 | -0/+6 |
|\ \ \ |
|
| * | | | remove the phrase as well | Steven Chanin | 2017-05-09 | 1 | -1/+1 |
| * | | | Capitalize Rake | Steven Chanin | 2017-05-09 | 1 | -2/+2 |
| * | | | [ci skip] explain async queue and rake tasks | Steven Chanin | 2017-05-09 | 1 | -0/+6 |
* | | | | Use recyclable cache keys (#29092) | David Heinemeier Hansson | 2017-05-18 | 30 | -116/+431 |
| |_|/
|/| | |
|
* | | | Merge pull request #29063 from sepehr500/master | Rafael França | 2017-05-17 | 2 | -2/+12 |
|\ \ \ |
|
| * | | | Fixed string being modified in place causing frozen string errors in Ruby 2.3 | sepehr500 | 2017-05-15 | 2 | -2/+12 |
* | | | | Merge pull request #29118 from kamipo/remove_respond_to_reset_scope | Rafael França | 2017-05-17 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Remove unneeded `association.respond_to?(:reset_scope)` | Ryuta Kamizono | 2017-05-17 | 1 | -1/+1 |
* | | | | | Merge pull request #29122 from koic/ci_against_jruby_9_1_9_0 | Rafael França | 2017-05-17 | 1 | -3/+3 |
|\ \ \ \ \ |
|
| * | | | | | CI against JRuby 9.1.9.0 | Koichi ITO | 2017-05-17 | 1 | -3/+3 |
|/ / / / / |
|
* | | | | | Merge pull request #29117 from yahonda/another_29021 | Rafael Mendonça França | 2017-05-16 | 1 | -23/+23 |
|\ \ \ \ \ |
|
| * | | | | | Set non 0 value to logger not to be affected by Ruby versions | Yasuo Honda | 2017-05-17 | 1 | -23/+23 |
| |/ / / / |
|
* | | | | | Merge pull request #29089 from yahonda/address_29021 | Rafael França | 2017-05-16 | 1 | -9/+9 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Address LogSubscriberTest failures to support Rails 2.5.0-dev | Yasuo Honda | 2017-05-16 | 1 | -9/+9 |
| |/ / / |
|
* | | | | Fix association documentation | Rafael Mendonça França | 2017-05-16 | 1 | -6/+5 |
* | | | | Merge pull request #29056 from juliusdelta/29055-missing-links-in-activesuppo... | Andrew White | 2017-05-16 | 1 | -1/+1 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Old expression caught to many chars resulting in 404. Added minor change to r... | JD Gonzales | 2017-05-12 | 1 | -1/+1 |
* | | | | Merge pull request #29095 from y-yagi/fix_test_with_rack_203 | Guillermo Iguaran | 2017-05-15 | 2 | -7/+7 |
|\ \ \ \ |
|
| * | | | | Fix `TestInvalidUrls` with rack 2.0.3 | yuuji.yaginuma | 2017-05-16 | 1 | -6/+6 |
| * | | | | Bump rack version | yuuji.yaginuma | 2017-05-16 | 1 | -1/+1 |
* | | | | | Merge pull request #29077 from rails/ignore-tables-in-sql-dump | Guillermo Iguaran | 2017-05-15 | 8 | -5/+85 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Changelog entry [ci-skip] | Guillermo Iguaran | 2017-05-15 | 1 | -0/+4 |
| * | | | | Improvements for SQLite rake task. | Guillermo Iguaran | 2017-05-15 | 1 | -7/+18 |
| * | | | | Update SchemaDumper.ignore_tables docs | Guillermo Iguaran | 2017-05-15 | 1 | -2/+2 |
| * | | | | Respect 'ignore_tables' in SQLite structure dump | Guillermo Iguaran | 2017-05-15 | 2 | -1/+30 |
| * | | | | Respect 'ignore_tables' in MySQL structure dump | Guillermo Iguaran | 2017-05-15 | 2 | -0/+22 |
| * | | | | Respect `ignore_tables` in Postgres structure dump | Rusty Geldmacher | 2017-05-15 | 2 | -0/+14 |
|/ / / / |
|
* | | | | Merge pull request #29086 from mikeycgto/message-encryptor-auth-tag-check | Kasper Timm Hansen | 2017-05-15 | 2 | -8/+20 |
|\ \ \ \ |
|
| * | | | | Updates to MessageEncryptor AEAD tests | Michael Coyne | 2017-05-15 | 1 | -10/+14 |
| * | | | | Fix for AEAD auth_tag check in MessageEncryptor | Michael Coyne | 2017-05-15 | 2 | -1/+9 |
* | | | | | Merge pull request #29083 from eugeneius/local_cache_unless_exist | Eileen M. Uchitelle | 2017-05-15 | 2 | -1/+14 |
|\ \ \ \ \ |
|