aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Small grammar fixJon Moss2017-04-271-1/+1
| | | | [ci skip]
* Small grammar fixesJon Moss2017-04-271-13/+13
| | | | | | Will backport to 5-1-stable, since the original PR landed there. [ci skip]
* Merge pull request #28913 from prathamesh-sonpatki/fix-indentRafael França2017-04-271-22/+22
|\ | | | | Fix indentation [ci skip]
| * Fix indentation [ci skip]Prathamesh Sonpatki2017-04-271-22/+22
|/
* Merge pull request #28911 from prathamesh-sonpatki/ar-release-notesRafael França2017-04-271-2/+74
|\ | | | | Added some more release notes for Active Record [ci skip]
| * Added some more release notes for Active Record [ci skip]Prathamesh Sonpatki2017-04-271-2/+74
|/
* Merge pull request #20701 from iamvery/date-helper-argument-errorAndrew White2017-04-273-18/+41
|\ | | | | Ensure input to distance_of_time_in_words is not nil
| * Ensure input to distance_of_time_in_words is not nilJay Hayes2017-04-273-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Internally all input is converted to time so that it can be treated uniformly. Remove now-unneeded condition * Now that all input is treated is converted to time, we no longer need to type check it. Rename variables to clarify their purpose Extract private method to normalize distance_of_time args to time Update actionview changelog
* | Merge pull request #28844 from ↵Kasper Timm Hansen2017-04-272-1/+3
|\ \ | | | | | | | | | | | | kyuden/remove_unnecessary_attributes_of_select_in_form_with Remove unnecessary `skip_default_ids` and `allow_method_names_outside_object` attributes of select tag in `form_with`
| * | Remove unnecessary `skip_default_ids` and ↵kyuden2017-04-242-1/+3
| | | | | | | | | | | | `allow_method_names_outside_object` attributes of select tag in `form_with`
* | | Merge pull request #28904 from robin850/update-working-with-javascriptRafael Mendonça França2017-04-271-35/+147
|\ \ \ | | | | | | | | | | | | Update the "Working with javascript" guide
| * | | Add documentation of data attributes for UJS [ci skip]Robin Dupret2017-04-271-1/+97
| | | |
| * | | Nest Action View remote helpers one level deeper [ci skip]Robin Dupret2017-04-271-3/+5
| | | |
| * | | Add a section with the different Ajax events [ci skip]Robin Dupret2017-04-271-0/+36
| | | |
| * | | Update the JavaScript guide to use `form_with`Robin Dupret2017-04-271-29/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `form_with` is the new preferred method to deal with generation of HTML forms and it enables Ajax support by default. [ci skip]
* | | | Also raise error when VERSION is nilRafael Mendonça França2017-04-273-3/+10
| | | | | | | | | | | | | | | | Fix #28905
* | | | Merge pull request #28906 from georgeclaghorn/fix-belongs-to-default-with-lambdaRafael França2017-04-272-1/+19
|\ \ \ \ | |/ / / |/| | | Evaluate belongs_to :default option against the owner, not the association
| * | | Evaluate belongs_to :default option against the owner, not the associationGeorge Claghorn2017-04-272-1/+19
|/ / /
* | | Merge pull request #28899 from kamipo/restore_fixture_author_addressesRafael França2017-04-2721-26/+26
|\ \ \ | | | | | | | | Restore `fixtures :author_addresses`
| * | | Restore `fixtures :author_addresses`Ryuta Kamizono2017-04-2721-26/+26
| | | | | | | | | | | | | | | | | | | | This change reverted in eac6f369 but it is needed for data integrity. See #25328.
* | | | Merge pull request #28896 from pschambacher/load_with_sharedRafael França2017-04-263-4/+49
|\ \ \ \ | |/ / / |/| | | Added a shared section to config/database.yml that will be loaded for all envs
| * | | Added a shared section to config/database.yml that will be loaded for all ↵Pierre Schambacher2017-04-263-4/+49
| | | | | | | | | | | | | | | | environments
* | | | Merge pull request #28883 from yahonda/fix28797Rafael França2017-04-262-3/+8
|\ \ \ \ | | | | | | | | | | PostgreSQL 10 does not convert `CURRENT_DATE` into `('now'::text)::date`
| * | | | PostgreSQL 10 allows `CURRENT_DATE` and `CURRENT_TIMESTAMP` as default functionsYasuo Honda2017-04-262-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Address #28797 In the previous versions of PostgreSQL, `CURRENT_DATE` converted to `('now'::text)::date` and `CURRENT_TIMESTAMP` converted to `now()`. Refer these discussions and commit at PostgreSQL : https://www.postgresql.org/message-id/flat/5878.1463098164%40sss.pgh.pa.us#5878.1463098164@sss.pgh.pa.us https://github.com/postgres/postgres/commit/0bb51aa96783e8a6c473c2b5e3725e23e95db834
* | | | | Merge pull request #28848 from Edouard-chin/ec-remove-unused-methodRafael França2017-04-261-7/+0
|\ \ \ \ \ | | | | | | | | | | | | `sort_query_string_params` method is no more used
| * | | | | `sort_query_string_params` method is no more usedEdouard CHIN2017-04-231-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This method was added in this commit https://github.com/rails/rails/commit/33258d713a4bc20b71e92fd656c923a7b189cd33 - The last caller got removed there https://github.com/rails/rails/commit/0b6ce3422370647cad3e91263a291f69b313d65b
* | | | | | Merge pull request #28897 from rafaelfranca/fix-name-error-error-pageAaron Patterson2017-04-262-1/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not try to encoding the parameters when the controller is not defined
| * | | | | | Do not try to encoding the parameters when the controller is not definedRafael Mendonça França2017-04-262-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you have a route that points to an nonexistent controller we raise an exception. This exception was being caught by the DebugExceptions middleware in development, but when trying to render the error page, we are reading the request format[[1][]]. To determine the request format we are reading the format parameters[[2][]], and to be able to read the parameters we need to encode them[[3][]]. This was raising another exception that to encode the parameter we try to load the controller to determine if we need to encode the parameters are binary[[4][]]. This new exception inside the DebugExceptions middleware makes Rails to render a generic error page. To avoid this new exception now we only encode the parameters when the controller can be loaded. Fixes #28892 [1]: https://github.com/rails/rails/blob/f52cdaac6336f99d13622ff9bda556a3124a4121/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb#L80 [2]: https://github.com/rails/rails/blob/f52cdaac6336f99d13622ff9bda556a3124a4121/actionpack/lib/action_dispatch/http/mime_negotiation.rb#L63 [3]: https://github.com/rails/rails/blob/f52cdaac6336f99d13622ff9bda556a3124a4121/actionpack/lib/action_dispatch/http/parameters.rb#L58 [4]: https://github.com/rails/rails/blob/f52cdaac6336f99d13622ff9bda556a3124a4121/actionpack/lib/action_dispatch/http/parameters.rb#L88
* | | | | | | Merge pull request #28881 from bogdanvlviv/verbose-migrationRafael França2017-04-262-2/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Set consistent typecast ENV["VERBOSE"]
| * | | | | | | Refactor DatabaseTasksMigrateTest#test_migrate_receives_correct_env_varsbogdanvlviv2017-04-261-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cases to ensure that environment variables VERBOSE and VERSION have correct typecast.
| * | | | | | | Refactor AR::Tasks::DatabaseTasks::migratebogdanvlviv2017-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set consistent type cast ENV["VERBOSE"]: ENV["VERBOSE"] is true if it not equal "false"
* | | | | | | | Merge pull request #28244 from ixti/improve/action-mailer-preview-paramsRafael França2017-04-265-6/+85
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Pass request params to ActionMailer::Preview
| * | | | | | | | Pass request params to ActionMailer::PreviewAlexey Zapparov2017-03-015-6/+85
| | | | | | | | |
* | | | | | | | | Merge pull request #28885 from kamipo/remove_useless_test_caseRafael França2017-04-262-13/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove useless test case
| * | | | | | | | | Remove useless test caseRyuta Kamizono2017-04-262-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cannot call private methods in `@klass` against `CollectionProxy` (inherites `Relation`) because using `public_send` in `method_missing`.
* | | | | | | | | | Merge pull request #28847 from Edouard-chin/current-page-checkquery-stringRafael França2017-04-262-1/+19
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix `current_page?` regression:
| * | | | | | | | | | Fix `current_page?` regression:Edouard CHIN2017-04-262-1/+19
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `check_parameters` kwargs was added to the `current_page?` method, the implementation was assuming only hashes responds to `delete`. This was causing issues when `current_page?` was called with a Active Model object - ref https://github.com/rails/rails/pull/27549 - Fixes #28846
* | | | | | | | | | Merge pull request #28891 from sodabrew/patch-1Rafael França2017-04-261-2/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | Remove mysql2 database adapter default username root
| * | | | | | | | | Remove mysql2 database adapter default username rootAaron Stone2017-04-261-2/+0
| | | | | | | | | |
* | | | | | | | | | Pluralize methodsJon Moss2017-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | More release notes for Rails 5.1 [ci skip]claudiob2017-04-261-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @dhh most changes that I mentioned in the talk were already there: https://speakerdeck.com/claudiob/rails-5-dot-1-upcoming-features I just added a few that were missing.
* | | | | | | | | | Merge pull request #28894 from robin850/5-1-notes-fixesClaudio B2017-04-261-28/+86
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | Some improvements to the 5.1 release notes
| * | | | | | | | | Add some items to the release notes [ci skip]Robin Dupret2017-04-271-0/+54
| | | | | | | | | |
| * | | | | | | | | Some improvements in the 5.1 release notes [ci skip]Robin Dupret2017-04-271-28/+32
|/ / / / / / / / /
* / / / / / / / / Revert "Merge pull request #27636 from ↵Rafael Mendonça França2017-04-2625-185/+98
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtsmfm/disable-referential-integrity-without-superuser-privilege-take-2" This reverts commit c1faca6333abe4b938b98fedc8d1f47b88209ecf, reversing changes made to 8c658a0ecc7f2b5fc015d424baf9edf6f3eb2b0b. See https://github.com/rails/rails/pull/27636#issuecomment-297534129
* | | | / / / / Lock connection before checking it inMatthew Draper2017-04-261-6/+8
| |_|_|/ / / / |/| | | | | |
* | | | | | | s/broadcasing/broadcasting/Akira Matsuda2017-04-271-1/+1
| |/ / / / / |/| | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #28839 from y-yagi/fix-yarn-exit-statusRafael França2017-04-251-2/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Ensure bin/yarn matches the one generated by webpacker
| * | | | | Ensure bin/yarn matches the one generated by webpackeryuuji.yaginuma2017-04-231-2/+3
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Import from https://github.com/rails/webpacker/pull/277. Fixes https://github.com/rails/webpacker/issues/278
* | | | | Describe the changes in transactional testsMatthew Draper2017-04-251-0/+31
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 21:18:45 +0000