aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Use `flat_map` rather than `map(&:...).flatten`Ryuta Kamizono2017-04-292-3/+3
| | | | | | | |
* | | | | | | | Merge pull request #28943 from koshigoe/port-arg-has-precedence-over-env-varRafael França2017-05-012-2/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | CLI arg `--port` has precedence over env `PORT`
| * | | | | | | | CLI arg `--port` has precedence over env `PORT`.koshigoe2017-05-012-2/+15
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #28753 from st0012/add-render-with-variants-testKasper Timm Hansen2017-05-013-0/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add tests for rendering with variants
| * | | | | | | | Add tests for render template/partial with variants option.Stan Lo2017-04-143-0/+10
| | | | | | | | |
* | | | | | | | | Merge pull request #28939 from kirs/maintain_test_schema_friendlyAndrew White2017-05-011-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Friendly maintain schema error in test runner
| * | | | | | | | | Friendly maintain schema failureKir Shatrov2017-04-301-1/+6
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #28944 from alexcameron89/update_templatesRafael França2017-05-015-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update the Gem Bug Report Templates to 5.1.0
| * | | | | | | | | Update the Gem Bug Report Templates to 5.1.0Alex Kitchens2017-05-015-5/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | 5.1.0 has been released, and the gem templates can reflect that now.
* | | | | | | | | Merge pull request #28941 from y-yagi/remove_needless_remove_fileRafael França2017-05-011-4/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Remove unnecessary `package.json` deletion
| * | | | | | | | Remove unnecessary `package.json` deletionyuuji.yaginuma2017-05-011-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `package.json` is created only if `skip_yarn` is not specified. https://github.com/rails/rails/blob/a4c1282854795d1f0d7696ce1ccbabf94b3d9098/railties/lib/rails/generators/rails/app/app_generator.rb#L202..L204
* | | | | | | | | Remove `:doc:` in `:nodoc:` class [ci skip]Ryuta Kamizono2017-05-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `:doc:` was added in bc478158 but originally `UriEncoder` is a `:nodoc:` class.
* | | | | | | | | Add periodJon Moss2017-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge pull request #28936 from ↵Jon Moss2017-04-301-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dixpac/dixpac/update-docs-ActionDispatch__Journey__Router__Utils.unescape_uri Add docs for Router::Utils.unescape_uri method. [ci skip]
| * | | | | | | | | Add docs for Router::Utils.unescape_uri methoddixpac2017-04-301-0/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #28934 from y-yagi/fix-note-about-secretsRyuta Kamizono2017-04-301-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix note about `secrets.yml` [ci skip]
| * | | | | | | | Fix note about `secrets.yml` [ci skip]yuuji.yaginuma2017-04-301-3/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | The `secrets` method is in `Application` class, not `Configuration` class.
* | | | | | | | Cleanup CHANGELOGs [ci skip]Ryuta Kamizono2017-04-308-25/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove trailing spaces. * Add backticks around method and command. * Fix indentation.
* | | | | | | | Merge pull request #28924 from y-yagi/fix-release-noteRafael França2017-04-291-10/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Remove entries included in 5.0 [ci skip]
| * | | | | | | Remove entries included in 5.0 [ci skip]yuuji.yaginuma2017-04-291-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `Permit same-origin connections by default` was backported in db70978, 549d732. * `Deprecated `:controller` and `:action` path parameters` was included in 6520ea5. * `Exception handling: use `rescue_from` was included in 6b54316.
* | | | | | | | Merge pull request #28923 from maclover7/jm-structRafael França2017-04-281-23/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Stop creating duplicate Struct instances
| * | | | | | | Stop creating duplicate Struct instancesJon Moss2017-04-281-23/+15
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just use one `Event` class. Reduces duplication, makes the tests easier to read. It might seem like each tests needs a different kind of Struct, since we make a new one for each test case.
* | | | | | | Merge pull request #28920 from eugeneius/require_remove_methodRafael França2017-04-281-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add missing require for `remove_possible_method`
| * | | | | | | Add missing require for `remove_possible_method`Eugene Kenny2017-04-281-0/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/505537082849d912e8e29819655b80a573e93c0c added a call to `remove_possible_method`, but didn't require the file that defines it.
* | | | | | | 5.1 Release Notes are complete [ci skip]claudiob2017-04-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | @prathamesh-sonpatki added the last missing commits in #28911.
* | | | | | | Small grammar fixJon Moss2017-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 21:33:07 +0000