aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #32937 from assain/add-purpose-to-cookiesKasper Timm Hansen2018-08-128-23/+218
|\ \ \ \ \ \ \
| * | | | | | | Purpose Metadata For Signed And Encrypted CookiesAssain2018-08-128-23/+218
|/ / / / / / /
* | | | | | | Merge pull request #33591 from bogdanvlviv/add-changelog-for-31503Eileen M. Uchitelle2018-08-121-0/+16
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add changelog entry for #31503 [ci skip]bogdanvlviv2018-08-121-0/+16
|/ / / / / /
* | | | | | Merge pull request #33474 from olivierlacan/old-migrationsRichard Schneeman2018-08-111-3/+22
|\ \ \ \ \ \
| * | | | | | Document best practices with old migrationsOlivier Lacan2018-08-031-3/+22
* | | | | | | Merge pull request #33563 from lzap/foreign-key-note-docRichard Schneeman2018-08-111-0/+4
|\ \ \ \ \ \ \
| * | | | | | | ActiveRecord Guide - sqlite3 foreign keys noteLukas Zapletal2018-08-091-0/+4
* | | | | | | | Merge pull request #33587 from bogdanvlviv/follow-up-33202Kasper Timm Hansen2018-08-112-4/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | `bundle binstubs bundler` should be executed after `bundle install`bogdanvlviv2018-08-112-4/+3
* | | | | | | | | Merge pull request #33581 from q-centrix/use-strings-on-decorator-methodKasper Timm Hansen2018-08-112-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use strings instead of symbols on calls to decorate_matching_attribute_typesDillon Welch2018-08-102-2/+2
* | | | | | | | | | Merge pull request #33588 from bogdanvlviv/follow-up-31503Kasper Timm Hansen2018-08-111-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix test failurebogdanvlviv2018-08-111-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #33586 from vinistock/make_active_job_name_prefix_staticGeorge Claghorn2018-08-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Make active job name prefix static since Rails.env will always be the sameVinicius Stock2018-08-111-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #31503 from bogdan/timestamp-as-jsonEileen M. Uchitelle2018-08-112-9/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix AM::Serializers::JSON#as_json method for timestampsBogdan Gusiev2017-12-212-9/+14
* | | | | | | | | | Merge pull request #33202 from deivid-rodriguez/bundler_binstubsEileen M. Uchitelle2018-08-115-32/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Generate bundler-compatible bundler binstubDavid Rodríguez2018-06-235-6/+14
| * | | | | | | | | | Improve readability of some specsDavid Rodríguez2018-06-231-9/+9
| * | | | | | | | | | Factor out some common bundler mocking logicDavid Rodríguez2018-06-231-20/+9
* | | | | | | | | | | Merge pull request #33553 from bogdanvlviv/ensure-load_schema-does_not-output...Eileen M. Uchitelle2018-08-111-0/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Ensure that running tests in parallel doesn't display schema load outputbogdanvlviv2018-08-081-0/+18
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Document all Active Storage error classes [ci skip]George Claghorn2018-08-101-0/+8
* | | | | | | | | | | Add a generic base class for Active Storage exceptionsGeorge Claghorn2018-08-102-4/+14
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #31640 from gingerlime/patch-1Richard Schneeman2018-08-101-4/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixes #27157 CSRF protection documentationgingerlime2018-01-051-4/+11
* | | | | | | | | | | Extract transformersGeorge Claghorn2018-08-106-70/+146
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #33568 from mohitnatoo/perform-or-enqueueGeorge Claghorn2018-08-091-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | perform_or_enqueue instead of enqueue_or_performMohit Natoo2018-08-091-3/+3
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | DRY up web image checks in ActiveStorage::VariantGeorge Claghorn2018-08-091-18/+24
* | | | | | | | | | Fix a typo in Active Support's CHANGELOG [ci skip]Robin Dupret2018-08-101-1/+1
* | | | | | | | | | Add missing instructions for FreeBSD [ci skip]Robin Dupret2018-08-091-10/+18
* | | | | | | | | | Merge pull request #33566 from yahonda/use_i18n_101Ryuta Kamizono2018-08-102-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Avoid i18n 1.1.0 for nowYasuo Honda2018-08-092-0/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #33554 from saveriomiroddi/sav-correct_updated_at_guide_ex...Eileen M. Uchitelle2018-08-081-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ActiveRecord Basics guide: correct explanation of the `updated_at` logic [ci ...Saverio Miroddi2018-08-081-1/+1
* | | | | | | | | | Merge pull request #33552 from seratch/fix-obvious-typosMatthew Draper2018-08-088-19/+19
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix a wrong correctionKazuhiro Sera2018-08-081-1/+1
| * | | | | | | | | Fix the obvious typos detected by github.com/client9/misspellKazuhiro Sera2018-08-088-19/+19
|/ / / / / / / / /
* | | | | | | | | Merge pull request #33548 from Ana06/lambda-validationRafael França2018-08-071-0/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Add lambdas in conditional validationsAna María Martínez Gómez2018-08-071-0/+7
|/ / / / / / / /
* | | | | | | | Merge pull request #33541 from lsylvester/clean-template-method-namesEileen M. Uchitelle2018-08-072-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | update BacktraceCleaner::RENDER_TEMPLATE_PATTERN to match the ActionView::Tem...Lachlan Sylvester2018-08-072-1/+8
|/ / / / / / / /
* | | | | | | | Camelize instead of classifyingGeorge Claghorn2018-08-061-1/+1
* | | | | | | | Merge pull request #33540 from joeltaylor/improve_service_adapter_error_handlingGeorge Claghorn2018-08-062-1/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve ActiveStorage service adapter error handlingJoel Taylor2018-08-062-1/+9
|/ / / / / / / /
* | | | | | | | Merge pull request #33533 from lsylvester/fix-irb-backtrace-cleaner-testMatthew Draper2018-08-061-5/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Filter backtrace in test to ensure irb counts as user codeLachlan Sylvester2018-08-061-5/+6
|/ / / / / / / /