aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add CHANGELOG entry for #14861 and document private methods on the APIRafael Mendonça França2014-06-302-5/+10
|
* Merge pull request #14861 from igor04/dirty-rollbackRafael Mendonça França2014-06-302-0/+35
|\ | | | | | | Added rollback method to ActiveModel::Dirty
| * Added rollback method to ActiveModel::Dirtyigor042014-06-232-0/+35
| |
* | Merge pull request #15991 from sgrif/sg-has-attributeRafael Mendonça França2014-06-301-6/+1
|\ \ | | | | | | Don't add a second method for attribute existence
| * | Don't add a second method for attribute existenceSean Griffin2014-06-301-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/masterRafael Mendonça França2014-06-301-1/+1
|\ \ | | | | | | Fix 10.3 invite_email.body assert_match documentation example.
| * | Fix 10.3 invite_email.body assert_match example.Nick Pellant2014-06-301-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 noteSean Griffin2014-06-302-28/+34
| |
* | Merge pull request #15987 from jamesprior/patch-2Sean Griffin2014-06-301-0/+9
|\ \ | | | | | | Update documentation on STI change handling
| * | Update documentation on STI change handlingjamesprior2014-06-301-0/+9
|/ / | | | | Documenting a potential source of confusion about how STI classes handle changes.
* | Merge pull request #15981 from sgrif/sg-simplify-defaultsRafael Mendonça França2014-06-293-21/+9
|\ \ | | | | | | Simplify creation of default attributes on AR instance
| * | Simplify creation of default attributes on AR instanceSean Griffin2014-06-294-21/+10
| | | | | | | | | | | | `AttributeSet#dup` has all the behavior we need.
* | | Merge pull request #15977 from sgrif/sg-remove-array-hackGodfrey Chan2014-06-291-24/+0
|\ \ \ | | | | | | | | Remove array workaround in PG quoting
| * | | Remove array workaround in PG quotingSean Griffin2014-06-291-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-memberGodfrey Chan2014-06-292-12/+9
|\ \ \ \ | |/ / / |/| | | Remove unused `array_member` from PG quoting for HStore columns
| * | | Remove unused `array_member` from PG quoting for HStore columnsSean Griffin2014-06-292-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-pointGodfrey Chan2014-06-293-19/+9
|\ \ \ | | | | | | | | Use the type object when sending point columns to the DB
| * | | Use the type object when sending point columns to the DBSean Griffin2014-06-293-19/+9
| | | |
* | | | Merge pull request #15976 from sgrif/sg-attribute-existsGodfrey Chan2014-06-291-2/+7
|\ \ \ \ | |/ / / |/| | | Don't encourage usage of `columns_hash`
| * | | Don't encourage usage of `columns_hash`Sean Griffin2014-06-291-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-valuesGodfrey Chan2014-06-292-7/+4
|\ \ \ \ | | | | | | | | | | Use `Hash#transform_values` to clean up `AttributeSet`
| * | | | Use `Hash#transform_values` to clean up `AttributeSet`Sean Griffin2014-06-292-7/+4
| | |/ / | |/| |
* | | | Merge pull request #15979 from sgrif/sg-json-quotingGodfrey Chan2014-06-294-23/+11
|\ \ \ \ | |/ / / |/| | | Use the type object for sending JSON to the database
| * | | Use the type object for sending JSON to the databaseSean Griffin2014-06-294-23/+11
| |/ /
* | | Merge pull request #15819 from sgrif/sg-hash-map-valuesGuillermo Iguaran2014-06-294-0/+76
|\ \ \ | |/ / |/| | Add `Hash#map_values` to ActiveSupport to simplify a common pattern
| * | Add `Hash#map_values` to ActiveSupportSean Griffin2014-06-294-0/+76
|/ / | | | | | | | | Didn't get a chance to convert existing code, I'll skim through the code base to make use of this later this afternoon.
* | Tiny documentation fixes [ci skip]Robin Dupret2014-06-293-5/+5
| |
* | Quick pass through Active Support and guides CHANGELOGRobin Dupret2014-06-292-3/+5
| | | | | | | | [ci skip]
* | Merge pull request #15961 from mckramer/patch-1Rafael Mendonça França2014-06-291-2/+2
|\ \ | | | | | | Rename options param of #time_ago_in_words to match API change
| * | Rename options param of #time_ago_in_words to match API changeMax Kramer2014-06-281-2/+2
| | | | | | | | | Rename `include_seconds_or_options` to `options` to match 6b9356a (which removed the deprecation introduced by #6077). This has no functional impact because the parameter is passed directly through, but makes it clearer that the parameter no longer supports a boolean as input.
* | | Merge pull request #15962 from sgrif/sg-types-for-defaultsRafael Mendonça França2014-06-298-28/+25
|\ \ \ | | | | | | | | Always pass a column with a cast_type to quote
| * | | Always pass a column with a type object to quoteSean Griffin2014-06-288-28/+25
| |/ / | | | | | | | | | | | | | | | | | | | | | The only case where we got a column that was not `nil`, but did not respond to `cast_type` was when type casting the default value during schema creation. We can look up the cast type, and add that object to the column definition. Will allow us to consistently rely on the type objects for type casting in all directions.
* | | Merge pull request #15963 from roryokane/getting-started-guide-fix-grammarSean Griffin2014-06-281-3/+3
|\ \ \ | | | | | | | | Add punctuation and fix capitalization in Getting Started guide
| * | | Add punctuation and fix capitalization in Getting Started guideRory O’Kane2014-06-281-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix more small grammar mistakes in the [Getting Started guide](http://edgeguides.rubyonrails.org/getting_started.html#security), in sections 9 and 10. Specifically, within sections 9.1 “Basic Authentication”, 9.2 “Other Security Considerations”, and 10 “What's Next?”. “Rails Guides” is generally capitalized on the site, including on the linked page and in the title of the site, so I capitalized it. “The” is not part of the name of the Ruby on Rails Security Guide – “The” is not in the title on that page. And I added a missing period and a missing colon at the ends of two sentences.
* | | Merge pull request #15964 from JuanitoFatas/doc/patch-01Sean Griffin2014-06-281-1/+1
|\ \ \ | |/ / |/| | [ci skip] Fix router option reference in 4.2 release notes.
| * | [ci skip] Fix router option reference in 4.2 release notes.Juanito Fatas2014-06-291-1/+1
| | |
* | | Merge pull request #15957 from seuros/duplicateYves Senn2014-06-281-12/+3
|\ \ \ | | | | | | | | [Postgresql tests] remove duplicate helper
| * | | [Postgresql tests] remove duplicate helperAbdelkader Boudih2014-06-281-12/+3
| | | |
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-06-281-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] Add missing colon and period in initialization.md.Juanito Fatas2014-06-251-3/+3
| | | |
| * | | Revert "Formatting fix in AS changelog [ci skip]"Rafael Mendonça França2014-06-161-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cede0363830e28e73feafc662eccae7d1db526bb. Reason: CHANGELOG should not be updated on docrails
| * | | Formatting fix in AS changelog [ci skip]Juanjo Bazán2014-06-161-2/+5
| | | |
* | | | Merge pull request #15955 from JuanitoFatas/levenshtein-guideGuillermo Iguaran2014-06-281-21/+29
|\ \ \ \ | | | | | | | | | | Update the levenshtein distance method in guides.
| * | | | Update the levenshtein distance method in guides.Juanito Fatas2014-06-281-21/+29
| | |/ / | |/| |
* | | | Merge pull request #15954 from roryokane/getting-started-guide-add-periodSean Griffin2014-06-281-1/+1
|\ \ \ \ | |/ / / |/| | | Add missing period in Getting Started guide
| * | | Add missing period in Getting Started guideRory O’Kane2014-06-281-1/+1
|/ / / | | | | | | | | | Within section 5.10 Adding Some Validation
* | | Merge pull request #15951 from pcreux/fix-mysql-test-fkGodfrey Chan2014-06-271-1/+4
|\ \ \ | | | | | | | | MySQL doesn't work with foreign keys
| * | | MySQL doesn't work with foreign keysPhilippe Creux2014-06-271-1/+4
|/ / / | | | | | | | | | | | | | | | This was previously fixed in e84799d but broken in 3f596f8. This commit reintroduced the conditional that prevents the foreign keys from being added to MySQL databases.
* | | Merge pull request #15949 from pcreux/fix-add-foreign-key-in-testGodfrey Chan2014-06-271-1/+1
|\ \ \ | | | | | | | | Fix test with `add_foreign_key` DSL
| * | | Fix test with add_foreign_key DSL in 9d21ef9Philippe Creux2014-06-271-1/+1
|/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-14 06:33:24 +0000