Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix SQL injection when querying against ranges and bitstrings | Rafael Mendonça França | 2014-07-02 | 3 | -4/+16 |
| | | | | Fix CVE-2014-3483 and protect against CVE-2014-3482. | ||||
* | Fix typo | Rafael Mendonça França | 2014-07-02 | 1 | -1/+1 |
| | |||||
* | Merge pull request #16016 from sgrif/sg-dup | Rafael Mendonça França | 2014-07-02 | 3 | -2/+19 |
|\ | | | | | Don't error when `dup`ing a record with no PK | ||||
| * | Don't error when `dup`ing a record with no PK | Sean Griffin | 2014-07-02 | 3 | -2/+19 |
| | | |||||
* | | Merge pull request #16007 from nishantmodak/flash_msg_as_string | Rafael Mendonça França | 2014-07-02 | 1 | -3/+6 |
|\ \ | |/ |/| | flash doesn't pass objects #15522 [ci skip] | ||||
| * | flash doesn't pass objects #15522 [ci skip] | Nishant Modak | 2014-07-01 | 1 | -3/+6 |
| | | |||||
* | | Revert "Merge pull request #15394 from ↵ | Rafael Mendonça França | 2014-07-02 | 4 | -105/+3 |
| | | | | | | | | | | | | | | | | | | | | morgoth/fix-automatic-maintaining-test-schema-for-sql-format" This reverts commit 46139d33c06715e74ad450428ece3ee84da98579, reversing changes made to 8f247871bb18b2e3036a05df5f62cbfe3b402586. Conflicts: activerecord/CHANGELOG.md | ||||
* | | Tiny follow-up to #15987 and 088b4c3e [ci skip] | Robin Dupret | 2014-07-02 | 1 | -4/+4 |
| | | |||||
* | | do not hold on to a stale connection object. fixes #15998 | Aaron Patterson | 2014-07-01 | 2 | -6/+14 |
| | | |||||
* | | Merge pull request #15999 from ↵ | Rafael Mendonça França | 2014-07-01 | 1 | -0/+32 |
|\ \ | |/ |/| | | | | | eileencodes/add-regression-tests-for-keys-on-nested-associations Add regression tests for keys on nested associations | ||||
| * | Add regression tests for keys on nested associations | eileencodes | 2014-07-01 | 1 | -0/+32 |
| | | | | | | | | | | | | This adds the regressions tests from issue #15893 to master. It's checking that both strings and symbols are accepted as keys for nested associations. | ||||
* | | Merge pull request #16006 from ShunsukeAida/xml_http_request_comment_change | Rafael Mendonça França | 2014-07-01 | 1 | -2/+2 |
|\ \ | | | | | | | [ci skip] Fixed the documentation of xml_http_request? (aka xhr?) | ||||
| * | | makes it sound less misleading | ShunsukeAida | 2014-07-02 | 1 | -2/+2 |
| | | | |||||
* | | | Rename preview_enabled option to show_previews | Rafael Mendonça França | 2014-07-01 | 6 | -20/+20 |
| | | | |||||
* | | | Merge pull request #15970 from ↵ | Rafael Mendonça França | 2014-07-01 | 7 | -3/+80 |
|\ \ \ | |/ / |/| | | | | | | | | | | | lengarvey/add_configuration_option_for_mail_preview Add configuration to enable mail previews | ||||
| * | | Add configuration to enable mail previews | Leonard Garvey | 2014-07-01 | 7 | -3/+80 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `config.action_mailer.preview_enabled` This allows mail previewing to be enabled easily in non-development environments such as staging. The default is set to true for development so no changes should be required to existing Rails applications. The mail preview path can still be configured using the existing `config.action_mailer.preview_path` configuration option. Adding this avoids devs from having to do stuff like: https://gist.github.com/lengarvey/fa2c9bd6cdbeba96526a Update actionmailer/CHANGELOG with new configuration. Update configuring guide with new configuratation. Add `config.action_mailer.preview_path` to configuring guide. | ||||
* | | | Merge pull request #16000 from sgrif/sg-silence-warning | Matthew Draper | 2014-07-02 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Silence warning emitted in tests | ||||
| * | | | Silence warning emitted in tests | Sean Griffin | 2014-07-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | The instance method `model_name` was being defined multiple times, causing a redefinition warning. | ||||
* | | | | Merge pull request #16004 from JuanitoFatas/doc/patch-1 | Rafael Mendonça França | 2014-07-01 | 1 | -0/+2 |
|\ \ \ \ | |/ / / |/| | | | [ci skip] Add missing prologue section of upgrading ruby on rails guide. | ||||
| * | | | [ci skip] Add missing prologue section of upgrading ruby on rails guide. | Juanito Fatas | 2014-07-01 | 1 | -0/+2 |
| | |/ | |/| | |||||
* | | | Merge pull request #15997 from cirosantilli/typo | Eileen M. Uchitelle | 2014-07-01 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Fix doc unwanted dl Admin:: [ci skip] | ||||
| * | | Fix doc unwanted dl Admin:: [ci skip] | Ciro Santilli | 2014-07-01 | 1 | -1/+1 |
|/ / | |||||
* | | push host / port / protocol extraction up | Aaron Patterson | 2014-06-30 | 1 | -6/+6 |
| | | | | | | | | Then we only need to extract host once. | ||||
* | | Add CHANGELOG entry for #15214 | Rafael Mendonça França | 2014-06-30 | 1 | -0/+4 |
| | | | | | | | | Closes #15214 | ||||
* | | Use if/else | Rafael Mendonça França | 2014-06-30 | 1 | -2/+5 |
| | | | | | | | | | | Since we are using both branches of the code is preferable to use if/else over the early return. | ||||
* | | Merge pull request #15214 from todd/date_field_docs | Rafael Mendonça França | 2014-06-30 | 3 | -2/+119 |
|\ \ | | | | | | | | | | Added String support for min and max properties for date field helpers | ||||
| * | | Add String support for min/max attributes on DatetimeField | Todd Bealmear | 2014-06-30 | 3 | -2/+119 |
|/ / | |||||
* | | Rename rollback_changes to undo_changes | Rafael Mendonça França | 2014-06-30 | 3 | -6/+6 |
| | | | | | | | | To avoid overload with database rollback | ||||
* | | Add CHANGELOG entry for #14861 and document private methods on the API | Rafael Mendonça França | 2014-06-30 | 2 | -5/+10 |
| | | |||||
* | | Merge pull request #14861 from igor04/dirty-rollback | Rafael Mendonça França | 2014-06-30 | 2 | -0/+35 |
|\ \ | | | | | | | | | | Added rollback method to ActiveModel::Dirty | ||||
| * | | Added rollback method to ActiveModel::Dirty | igor04 | 2014-06-23 | 2 | -0/+35 |
| | | | |||||
* | | | Merge pull request #15991 from sgrif/sg-has-attribute | Rafael Mendonça França | 2014-06-30 | 1 | -6/+1 |
|\ \ \ | | | | | | | | | Don't add a second method for attribute existence | ||||
| * | | | Don't add a second method for attribute existence | Sean Griffin | 2014-06-30 | 1 | -6/+1 |
|/ / / | | | | | | | | | | | | | We already had one in the public API that people can use more easily for the transition | ||||
* | | | Merge pull request #15989 from nickpellant/master | Rafael Mendonça França | 2014-06-30 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix 10.3 invite_email.body assert_match documentation example. | ||||
| * | | | Fix 10.3 invite_email.body assert_match example. | Nick Pellant | 2014-06-30 | 1 | -1/+1 |
|/ / / | | | | | | | | | | | | | Currently there is no implicit conversion for Mail::Body to string therefore .to_s must be applied. This is exampled in 10.2.2. | ||||
* | | | Move STI docs off of the main Base document, leaving a note | Sean Griffin | 2014-06-30 | 2 | -28/+34 |
| | | | |||||
* | | | Merge pull request #15987 from jamesprior/patch-2 | Sean Griffin | 2014-06-30 | 1 | -0/+9 |
|\ \ \ | | | | | | | | | Update documentation on STI change handling | ||||
| * | | | Update documentation on STI change handling | jamesprior | 2014-06-30 | 1 | -0/+9 |
|/ / / | | | | | | | Documenting a potential source of confusion about how STI classes handle changes. | ||||
* | | | Merge pull request #15981 from sgrif/sg-simplify-defaults | Rafael Mendonça França | 2014-06-29 | 3 | -21/+9 |
|\ \ \ | | | | | | | | | Simplify creation of default attributes on AR instance | ||||
| * | | | Simplify creation of default attributes on AR instance | Sean Griffin | 2014-06-29 | 4 | -21/+10 |
| | | | | | | | | | | | | | | | | `AttributeSet#dup` has all the behavior we need. | ||||
* | | | | Merge pull request #15977 from sgrif/sg-remove-array-hack | Godfrey Chan | 2014-06-29 | 1 | -24/+0 |
|\ \ \ \ | | | | | | | | | | | Remove array workaround in PG quoting | ||||
| * | | | | Remove array workaround in PG quoting | Sean Griffin | 2014-06-29 | 1 | -24/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | We no longer need to do fancy legwork to make sure arrays use a type object, now that schema methods use a real type object. | ||||
* | | | | | Merge pull request #15978 from sgrif/sg-pg-array-member | Godfrey Chan | 2014-06-29 | 2 | -12/+9 |
|\ \ \ \ \ | |/ / / / |/| | | | | Remove unused `array_member` from PG quoting for HStore columns | ||||
| * | | | | Remove unused `array_member` from PG quoting for HStore columns | Sean Griffin | 2014-06-29 | 2 | -12/+9 |
|/ / / / | | | | | | | | | | | | | | | | | Hstore no longer needs additional quoting to be used in an array, the array type handles it sufficiently. | ||||
* | | | | Merge pull request #15983 from sgrif/sg-inline-point | Godfrey Chan | 2014-06-29 | 3 | -19/+9 |
|\ \ \ \ | | | | | | | | | | | Use the type object when sending point columns to the DB | ||||
| * | | | | Use the type object when sending point columns to the DB | Sean Griffin | 2014-06-29 | 3 | -19/+9 |
| | | | | | |||||
* | | | | | Merge pull request #15976 from sgrif/sg-attribute-exists | Godfrey Chan | 2014-06-29 | 1 | -2/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | Don't encourage usage of `columns_hash` | ||||
| * | | | | Don't encourage usage of `columns_hash` | Sean Griffin | 2014-06-29 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in https://github.com/plataformatec/simple_form/pull/1094, we should not encourage usage of `columns_hash`, and instead provide an alternate method to determine whether or not an attribute exists. The language `attribute` was chosen over `column` since these are in the `AttributeMethods` module. | ||||
* | | | | | Merge pull request #15982 from sgrif/sg-attr-set-map-values | Godfrey Chan | 2014-06-29 | 2 | -7/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Use `Hash#transform_values` to clean up `AttributeSet` | ||||
| * | | | | | Use `Hash#transform_values` to clean up `AttributeSet` | Sean Griffin | 2014-06-29 | 2 | -7/+4 |
| | |/ / / | |/| | | |