aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #33566 from yahonda/use_i18n_101Ryuta Kamizono2018-08-102-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Avoid i18n 1.1.0 for now
| * | | | | | Avoid i18n 1.1.0 for nowYasuo Honda2018-08-092-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | [Yasuo Honda & lsylvester]
* | | | | | Merge pull request #33554 from ↵Eileen M. Uchitelle2018-08-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | saveriomiroddi/sav-correct_updated_at_guide_explanation ActiveRecord Basics guide: correct explanation of the `updated_at` logic [ci skip]
| * | | | | | ActiveRecord Basics guide: correct explanation of the `updated_at` logic [ci ↵Saverio Miroddi2018-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip] It's misleanding/incorrect to state that `updated_at` is set on updates, since creation != update (and the column is actually set on creation, too).
* | | | | | | Merge pull request #33552 from seratch/fix-obvious-typosMatthew Draper2018-08-088-19/+19
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Fix the obvious typos detected by github.com/client9/misspell
| * | | | | | 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 validations
| * | | | | | Add lambdas in conditional validationsAna María Martínez Gómez2018-08-071-0/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As `Lambdas` are a type of `Proc`, they can also be used in the `if`/`unless` option of a validation to decide when the validation is executed. Add this case to the guide for clarification. Closes https://github.com/rails/rails/issues/33212
* | | | | | Merge pull request #33541 from lsylvester/clean-template-method-namesEileen M. Uchitelle2018-08-072-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix filtering out ActionView::Template method names from backtrace.
| * | | | | | update BacktraceCleaner::RENDER_TEMPLATE_PATTERN to match the ↵Lachlan Sylvester2018-08-072-1/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | ActionView::Template method names
* | | | | | Camelize instead of classifyingGeorge Claghorn2018-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid mangling service names that end in S: "GCS".classify # => "GC" "GCS".camelize # => "GCS"
* | | | | | Merge pull request #33540 from joeltaylor/improve_service_adapter_error_handlingGeorge Claghorn2018-08-062-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve ActiveStorage service adapter error handling
| * | | | | | 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 code
| * | | | | | Filter backtrace in test to ensure irb counts as user codeLachlan Sylvester2018-08-061-5/+6
|/ / / / / /
* | | | | | Merge pull request #33531 from bogdanvlviv/move-changelog-entry-of-47018a82-upRyuta Kamizono2018-08-061-11/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move changelog entry of 47018a82 up [ci skip]
| * | | | | | Move changelog entry of 47018a82 up [ci skip]bogdanvlviv2018-08-051-11/+11
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We always add new entries on the top of changelog file. This commit moves the entry added in 47018a82 up in order to preserve the chronology. Follows up 3e2629eb7fae33cd521bf1c265d1bbe8ed04c59e
* | | | | | Support skip nil for cache fetch (#25437)Martin2018-08-053-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * test case for fetch cache miss with skip_nil * abondon nil cache if skip_nil specified * ensure not cache key for skip nil * add document with skip_nil for Store#fetch * add a new change log entry for #25437
* | | | | | Merge pull request #33454 from azbshiri/extend-affects-nested-attributesRichard Schneeman2018-08-043-2/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | Call build when extend with nested attributes defined
| * | | | | | Call build when extend with nested attributes definedAlireza Bashiri2018-08-023-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | What? From now on when `accepts_nested_attributes_for` defined and `extend` option added the overwritten `build` method being called. [Alireza Bashiri, Martins Polakovs]
* | | | | | | Merge pull request #33511 from ↵Richard Schneeman2018-08-044-6/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | albertoalmagro/change-references-from-rake-to-rails-command Change references from Rake task to Rails command
| * | | | | | | [ci skip] Change references from Rake task to Rails commandAlberto Almagro2018-08-014-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit follows the path we started at commit #ea4f0e2 and continued at PR #33229.
* | | | | | | | Fix uploading Tempfiles to Azure StorageGeorge Claghorn2018-08-032-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #32530.
* | | | | | | | Merge pull request #33507 from jackc/patch-1George Claghorn2018-08-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix file upload location recommendation
| * | | | | | | | Fix file upload location recommendationJack Christensen2018-08-011-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | Going one level downwards from Rails' /public directory would still be inside the public directory and therefore servable by the web server. Files should stored upwards of the public directory.
* | | | | | | | Merge pull request #33452 from thetizzo/rails_32_to_40_doc_updateGeorge Claghorn2018-08-031-0/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [Documentation] Mention default HTTP headers in Rails 3.2 to 4.0 upgrade guide
| * | | | | | | | Update Rails 3.2 to 4.0 upgrade guide to include a mention and tip for ↵thetizzo2018-08-031-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling the addition of configurable default HTTP headers. [ci skip]
* | | | | | | | | Merge pull request #33524 from spikeheap/masterPrem Sichanugrist2018-08-031-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [Documentation] Fix "adding member routes" guide inconsistency
| * | | | | | | | | [ci skip] Update adding member routes guide to fix inconsistency with the ↵Ryan Brooks2018-08-031-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation. Closes #33518
* | | | | | | | | `retrieve_connection_pool` return a pool, not a connectionRyuta Kamizono2018-08-031-2/+2
| | | | | | | | |
* | | | | | | | | Remove another unused requireGeorge Claghorn2018-08-021-2/+0
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #33513 from twitnithegirl/only_connect_once_in_parallel_testsRyuta Kamizono2018-08-021-1/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | remove redundant establish_connection call in test_databases.rb
| * | | | | | | don't establish connection test_database since it gets established in ↵Britni Alexander2018-08-011-1/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | load_schema
* | | | | | | Remove unused requireGeorge Claghorn2018-08-011-2/+0
| | | | | | |
* | | | | | | Merge pull request #33479 from twitnithegirl/make_parallel_testing_db_fasterEileen M. Uchitelle2018-08-012-6/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make parallel testing db faster
| * | | | | | | use load_schema instead of migrate for parallel testingBritni Alexander2018-07-312-6/+9
|/ / / / / / /
* | | | | | | Retry ActiveStorage::PurgeJobs on DB deadlockGeorge Claghorn2018-07-311-0/+1
| | | | | | |
* | | | | | | Merge pull request #33492 from kamipo/revert_breaking_default_order_contractRyuta Kamizono2018-08-013-22/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Revert the breaking existing default sort order contract
| * | | | | | | Revert "Merge pull request #24131 from brchristian/limit_and_primary_key"Ryuta Kamizono2018-08-013-22/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d162188dd662a7d9f62ba8431474f50bc35e3e93, reversing changes made to 3576782888c307e3e192c44e332b957cd1174128. Reason: #24131 conflicts the #5153's default order contract, it means that existing apps would be broken by that change. We don't want to break existing apps without a deprecation cycle.
| * | | | | | | Add test case for the #5153's default order contractRyuta Kamizono2018-08-011-0/+13
| | | | | | | |
* | | | | | | | Merge pull request #28937 from maclover7/jm-fix-28927Rafael França2018-07-312-1/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Default content type for `head` is `text/html`
| * | | | | | | Default content type for `head` is `text/html`Jon Moss2017-04-302-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise Mime::NullType will be returned as the `Content-Type` header.
* | | | | | | | Merge pull request #33490 from ↵Xavier Noria2018-07-311-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rails/revert-31883-remove-label-in-porgress-for-M-V-guides Revert "Remove label 'work in progress' for AM and AV guides"
| * | | | | | | | Revert "Remove label 'work in progress' for AM and AV guides"Xavier Noria2018-07-311-0/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #31883 from ↵Richard Schneeman2018-07-311-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/remove-label-in-porgress-for-M-V-guides Remove label 'work in progress' for AM and AV guides
| * | | | | | | | Remove label 'work in progress' for AM and AV guidesbogdanvlviv2018-02-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've reviewed "Active Model Basics" and "Action View Overview" guides and looks like they have good enough information and don't have errors. This commit removes label 'work in progress' for these guides.
* | | | | | | | | Merge pull request #33488 from znz/avoid-to-post-twiceRafael França2018-07-311-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Throw if ujs loaded twice
| * | | | | | | | | Throw if ujs loaded twiceKazuhiro NISHIYAMA2018-07-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I saw two posts of problem about ajax requesting twice on qiita. So I think detecting double loaded earlier make easy to find the problem. https://qiita.com/hot_study_man/items/56dc87ad734cfda68bb6 https://qiita.com/hisas/items/8399aec3a5377bf75017
* | | | | | | | | | Merge pull request #33489 from Atul9/remote-ipGeorge Claghorn2018-07-312-1/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Log the remote IP addr of clients behind a proxy
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 12:51:12 +0000