Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #28930 from kamipo/use_flat_map | Rafael França | 2017-05-01 | 2 | -3/+3 |
|\ | | | | | Use `flat_map` rather than `map(&:...).flatten` | ||||
| * | Use `flat_map` rather than `map(&:...).flatten` | Ryuta Kamizono | 2017-04-29 | 2 | -3/+3 |
| | | |||||
* | | Merge pull request #28943 from koshigoe/port-arg-has-precedence-over-env-var | Rafael França | 2017-05-01 | 2 | -2/+15 |
|\ \ | | | | | | | CLI arg `--port` has precedence over env `PORT` | ||||
| * | | CLI arg `--port` has precedence over env `PORT`. | koshigoe | 2017-05-01 | 2 | -2/+15 |
| | | | |||||
* | | | Merge pull request #28753 from st0012/add-render-with-variants-test | Kasper Timm Hansen | 2017-05-01 | 3 | -0/+10 |
|\ \ \ | | | | | | | | | Add tests for rendering with variants | ||||
| * | | | Add tests for render template/partial with variants option. | Stan Lo | 2017-04-14 | 3 | -0/+10 |
| | | | | |||||
* | | | | Merge pull request #28939 from kirs/maintain_test_schema_friendly | Andrew White | 2017-05-01 | 1 | -1/+6 |
|\ \ \ \ | | | | | | | | | | | Friendly maintain schema error in test runner | ||||
| * | | | | Friendly maintain schema failure | Kir Shatrov | 2017-04-30 | 1 | -1/+6 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #28944 from alexcameron89/update_templates | Rafael França | 2017-05-01 | 5 | -5/+5 |
|\ \ \ \ | | | | | | | | | | | Update the Gem Bug Report Templates to 5.1.0 | ||||
| * | | | | Update the Gem Bug Report Templates to 5.1.0 | Alex Kitchens | 2017-05-01 | 5 | -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_file | Rafael França | 2017-05-01 | 1 | -4/+0 |
|\ \ \ \ | |/ / / |/| | | | Remove unnecessary `package.json` deletion | ||||
| * | | | Remove unnecessary `package.json` deletion | yuuji.yaginuma | 2017-05-01 | 1 | -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 Kamizono | 2017-05-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | The `:doc:` was added in bc478158 but originally `UriEncoder` is a `:nodoc:` class. | ||||
* | | | | Add period | Jon Moss | 2017-04-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | Merge pull request #28936 from ↵ | Jon Moss | 2017-04-30 | 1 | -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 method | dixpac | 2017-04-30 | 1 | -0/+4 |
|/ / / / | |||||
* | | | | Merge pull request #28934 from y-yagi/fix-note-about-secrets | Ryuta Kamizono | 2017-04-30 | 1 | -3/+3 |
|\ \ \ \ | |/ / / |/| | | | Fix note about `secrets.yml` [ci skip] | ||||
| * | | | Fix note about `secrets.yml` [ci skip] | yuuji.yaginuma | 2017-04-30 | 1 | -3/+3 |
|/ / / | | | | | | | | | | The `secrets` method is in `Application` class, not `Configuration` class. | ||||
* | | | Cleanup CHANGELOGs [ci skip] | Ryuta Kamizono | 2017-04-30 | 8 | -25/+29 |
| | | | | | | | | | | | | | | | | | | * Remove trailing spaces. * Add backticks around method and command. * Fix indentation. | ||||
* | | | Merge pull request #28924 from y-yagi/fix-release-note | Rafael França | 2017-04-29 | 1 | -10/+0 |
|\ \ \ | |_|/ |/| | | Remove entries included in 5.0 [ci skip] | ||||
| * | | Remove entries included in 5.0 [ci skip] | yuuji.yaginuma | 2017-04-29 | 1 | -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-struct | Rafael França | 2017-04-28 | 1 | -23/+15 |
|\ \ \ | |/ / |/| | | Stop creating duplicate Struct instances | ||||
| * | | Stop creating duplicate Struct instances | Jon Moss | 2017-04-28 | 1 | -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_method | Rafael França | 2017-04-28 | 1 | -0/+1 |
|\ \ | | | | | | | Add missing require for `remove_possible_method` | ||||
| * | | Add missing require for `remove_possible_method` | Eugene Kenny | 2017-04-28 | 1 | -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] | claudiob | 2017-04-28 | 1 | -1/+0 |
| | | | | | | | | @prathamesh-sonpatki added the last missing commits in #28911. | ||||
* | | Small grammar fix | Jon Moss | 2017-04-27 | 1 | -1/+1 |
| | | | | | | | | [ci skip] | ||||
* | | Small grammar fix | Jon Moss | 2017-04-27 | 1 | -1/+1 |
| | | | | | | | | [ci skip] | ||||
* | | Small grammar fixes | Jon Moss | 2017-04-27 | 1 | -13/+13 |
| | | | | | | | | | | | | Will backport to 5-1-stable, since the original PR landed there. [ci skip] | ||||
* | | Merge pull request #28913 from prathamesh-sonpatki/fix-indent | Rafael França | 2017-04-27 | 1 | -22/+22 |
|\ \ | | | | | | | Fix indentation [ci skip] | ||||
| * | | Fix indentation [ci skip] | Prathamesh Sonpatki | 2017-04-27 | 1 | -22/+22 |
|/ / | |||||
* | | Merge pull request #28911 from prathamesh-sonpatki/ar-release-notes | Rafael França | 2017-04-27 | 1 | -2/+74 |
|\ \ | | | | | | | Added some more release notes for Active Record [ci skip] | ||||
| * | | Added some more release notes for Active Record [ci skip] | Prathamesh Sonpatki | 2017-04-27 | 1 | -2/+74 |
|/ / | |||||
* | | Merge pull request #20701 from iamvery/date-helper-argument-error | Andrew White | 2017-04-27 | 3 | -18/+41 |
|\ \ | | | | | | | Ensure input to distance_of_time_in_words is not nil | ||||
| * | | Ensure input to distance_of_time_in_words is not nil | Jay Hayes | 2017-04-27 | 3 | -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 Hansen | 2017-04-27 | 2 | -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 ↵ | kyuden | 2017-04-24 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | `allow_method_names_outside_object` attributes of select tag in `form_with` | ||||
* | | | | Merge pull request #28904 from robin850/update-working-with-javascript | Rafael Mendonça França | 2017-04-27 | 1 | -35/+147 |
|\ \ \ \ | | | | | | | | | | | | | | | | Update the "Working with javascript" guide | ||||
| * | | | | Add documentation of data attributes for UJS [ci skip] | Robin Dupret | 2017-04-27 | 1 | -1/+97 |
| | | | | | |||||
| * | | | | Nest Action View remote helpers one level deeper [ci skip] | Robin Dupret | 2017-04-27 | 1 | -3/+5 |
| | | | | | |||||
| * | | | | Add a section with the different Ajax events [ci skip] | Robin Dupret | 2017-04-27 | 1 | -0/+36 |
| | | | | | |||||
| * | | | | Update the JavaScript guide to use `form_with` | Robin Dupret | 2017-04-27 | 1 | -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 nil | Rafael Mendonça França | 2017-04-27 | 3 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | Fix #28905 | ||||
* | | | | | Merge pull request #28906 from georgeclaghorn/fix-belongs-to-default-with-lambda | Rafael França | 2017-04-27 | 2 | -1/+19 |
|\ \ \ \ \ | |/ / / / |/| | | | | Evaluate belongs_to :default option against the owner, not the association | ||||
| * | | | | Evaluate belongs_to :default option against the owner, not the association | George Claghorn | 2017-04-27 | 2 | -1/+19 |
|/ / / / | |||||
* | | | | Merge pull request #28899 from kamipo/restore_fixture_author_addresses | Rafael França | 2017-04-27 | 21 | -26/+26 |
|\ \ \ \ | | | | | | | | | | | Restore `fixtures :author_addresses` | ||||
| * | | | | Restore `fixtures :author_addresses` | Ryuta Kamizono | 2017-04-27 | 21 | -26/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This change reverted in eac6f369 but it is needed for data integrity. See #25328. | ||||
* | | | | | Merge pull request #28896 from pschambacher/load_with_shared | Rafael França | 2017-04-26 | 3 | -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 Schambacher | 2017-04-26 | 3 | -4/+49 |
| | | | | | | | | | | | | | | | | | | | | environments | ||||
* | | | | | Merge pull request #28883 from yahonda/fix28797 | Rafael França | 2017-04-26 | 2 | -3/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | PostgreSQL 10 does not convert `CURRENT_DATE` into `('now'::text)::date` |