| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into require_relative_2017 | Xavier Noria | 2017-07-02 | 9 | -11/+11 |
|\ |
|
| * | Revert "Merge pull request #29540 from kirs/rubocop-frozen-string" | Matthew Draper | 2017-07-02 | 226 | -226/+0 |
| * | Merge pull request #29540 from kirs/rubocop-frozen-string | Matthew Draper | 2017-07-02 | 226 | -0/+226 |
| |\ |
|
| | * | Enforce frozen string in Rubocop | Kir Shatrov | 2017-07-01 | 226 | -0/+226 |
| * | | Merge pull request #29506 from pat/frozen-string-literals | Matthew Draper | 2017-07-02 | 9 | -11/+11 |
| |\ \ |
|
| | * | | Make ActiveSupport frozen string literal friendly. | Pat Allan | 2017-06-20 | 9 | -11/+11 |
* | | | | [Active Support] require => require_relative | Akira Matsuda | 2017-07-01 | 129 | -383/+383 |
|/ / / |
|
* | / | Fix the next version of Rails from 5.3 to 6.0 | Koichi ITO | 2017-06-30 | 1 | -1/+1 |
| |/
|/| |
|
* | | Merge pull request #29595 from fatkodima/result_lambda_class_checking | Rafael França | 2017-06-28 | 1 | -1/+1 |
|\ \ |
|
| * | | Remove useless class checking for `ActiveSupport::Callbacks`s result_lambda | fatkodima | 2017-06-27 | 1 | -1/+1 |
| |/ |
|
* | | Fix typo in callback deprecation message | yuuji.yaginuma | 2017-06-28 | 1 | -1/+1 |
* | | Add more explicit guidance on how to fix callback deprecations | Sage Ross | 2017-06-23 | 1 | -2/+4 |
|/ |
|
* | Merge pull request #29140 from notEthan/log_subscribed_avoid_rescuing | Rafael França | 2017-06-16 | 1 | -2/+4 |
|\ |
|
| * | check that logger is defined in log subscriber rescue before logging | Ethan | 2017-05-24 | 1 | -1/+3 |
| * | lob subscriber should only rescue StandardError, not Exception | Ethan | 2017-05-24 | 1 | -1/+1 |
* | | Fix `Message::Encryptor` default cipher [ci skip] | yuuji.yaginuma | 2017-06-12 | 1 | -1/+1 |
* | | Merge pull request #29263 from assain/default_message_encryptor_to_gcm | Kasper Timm Hansen | 2017-06-11 | 2 | -4/+21 |
|\ \ |
|
| * | | set message_encryptor default cipher to aes-256-gcm | Assain | 2017-06-12 | 2 | -4/+21 |
* | | | Cache: test coverage for cleanup behavior with local cache strategy | Eugene Kenny | 2017-06-10 | 1 | -1/+1 |
* | | | Revert #25628. Incomplete change + needs a deprecation cycle. | Jeremy Daer | 2017-06-10 | 3 | -5/+5 |
* | | | Merge pull request #29386 from y-yagi/remove_unreachable_code | Guillermo Iguaran | 2017-06-07 | 1 | -8/+1 |
|\ \ \ |
|
| * | | | Remove unreachable code | yuuji.yaginuma | 2017-06-08 | 1 | -8/+1 |
| |/ / |
|
* / / | Cache: write_multi (#29366) | Jeremy Daer | 2017-06-06 | 1 | -6/+28 |
|/ / |
|
* | | Merge pull request #29294 from gsamokovarov/attributes-default | Kasper Timm Hansen | 2017-06-04 | 5 | -51/+33 |
|\ \ |
|
| * | | Use mattr_accessor default: option throughout the project | Genadi Samokovarov | 2017-06-03 | 4 | -27/+14 |
| * | | Implement mattr_acessor :default option | Genadi Samokovarov | 2017-06-03 | 1 | -24/+19 |
* | | | Don't create extra assignment, just return | Vipul A M | 2017-06-04 | 1 | -3/+3 |
|/ / |
|
* | | Add next occur and previous occurred day of week API (#26600) | Shota Iguchi | 2017-05-30 | 1 | -0/+16 |
* | | Add missing "not" in the doc for `assert_no_changes` [ci skip] | Ryuta Kamizono | 2017-05-30 | 1 | -1/+1 |
* | | Add option for class_attribute default (#29270) | David Heinemeier Hansson | 2017-05-29 | 4 | -11/+15 |
* | | Merge pull request #26628 from mjhoy/fix-number-to-human-25742 | Eileen M. Uchitelle | 2017-05-29 | 4 | -30/+73 |
|\ \ |
|
| * | | number_to_human_converter: round before calculating exponent | Michael Hoy | 2017-03-16 | 1 | -4/+2 |
| * | | number_to_rounded_converter: extract rounding logic | Michael Hoy | 2017-03-16 | 3 | -26/+71 |
* | | | Merge pull request #29074 from kamipo/remove_returning_true_in_internal_callb... | Kasper Timm Hansen | 2017-05-28 | 1 | -4/+0 |
|\ \ \ |
|
| * | | | Remove returning true in internal callbacks | Ryuta Kamizono | 2017-05-14 | 1 | -4/+0 |
* | | | | Merge pull request #29097 from EilisHamilton/fix_uncountable_pluralization_lo... | Matthew Draper | 2017-05-28 | 1 | -6/+9 |
|\ \ \ \ |
|
| * | | | | Fix pluralization of uncountables when given a locale | Eilis Hamilton | 2017-05-19 | 1 | -6/+9 |
| | |_|/
| |/| | |
|
* | | | | Clear all current instances before a reload. | Kasper Timm Hansen | 2017-05-28 | 2 | -2/+8 |
* | | | | Remove double Thread.current storage. | Kasper Timm Hansen | 2017-05-28 | 1 | -5/+3 |
* | | | | Use non-raising finder. | Kasper Timm Hansen | 2017-05-27 | 1 | -1/+1 |
* | | | | [ci skip] Fix spelling that's a bit of an overreach. | Kasper Timm Hansen | 2017-05-27 | 1 | -1/+1 |
* | | | | ActiveSupport::CurrentAttributes provides a thread-isolated attributes single... | David Heinemeier Hansson | 2017-05-26 | 3 | -0/+196 |
* | | | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__ | Matthew Draper | 2017-05-26 | 4 | -4/+4 |
|\ \ \ \ |
|
| * | | | | Define path with __dir__ | bogdanvlviv | 2017-05-23 | 4 | -4/+4 |
* | | | | | Fix a RuboCop offences using `rubocop -a` | Koichi ITO | 2017-05-24 | 1 | -2/+0 |
|/ / / / |
|
* | | | | Merge pull request #29163 from rails/fix-scalar-duration-calculation | Andrew White | 2017-05-21 | 1 | -6/+35 |
|\ \ \ \ |
|
| * | | | | Fix implicit calculations with scalars and durations | Andrew White | 2017-05-20 | 1 | -6/+35 |
* | | | | | Remove unused mismatch payload attribute | David Heinemeier Hansson | 2017-05-20 | 1 | -5/+1 |
|/ / / / |
|
* / / / | Add cache_key_with_version and use it in ActiveSupport::Cache.expand_cache_key | David Heinemeier Hansson | 2017-05-19 | 1 | -4/+5 |
|/ / / |
|
* | | | Use recyclable cache keys (#29092) | David Heinemeier Hansson | 2017-05-18 | 2 | -18/+68 |