aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use the type object when sending point columns to the DBSean Griffin2014-06-293-19/+9
|
* 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
|/ /
* | Merge pull request #15934 from seuros/renameRafael Mendonça França2014-06-273-3/+17
|\ \ | | | | | | | | | rename primary key sequence only if it exists
| * | rename sequence only if it existsAbdelkader Boudih2014-06-273-3/+17
| | |
* | | Merge pull request #15943 from wagenet/cache-instrumentationRafael Mendonça França2014-06-272-11/+17
|\ \ \ | | | | | | | | | | | | Always instrument ActiveSupport::Cache
| * | | Always instrument ActiveSupport::CachePeter Wagenet2014-06-271-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current approach is broken because it uses a thread local value which means on multi-threaded environments it has to be turned on per thread. Secondly, ActiveSupport::Notifications does not instrument items when there are not subscribers so this flag is unnecessary.
* | | | Merge pull request #15933 from rafael/masterRafael Mendonça França2014-06-276-5/+99
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add always permitted parameters as a configurable option. [Rafael Mendonça França + Gary S. Weaver]
| * | | | Improvements per code review.Rafael Chacón2014-06-274-5/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * General style fixes. * Add changes to configuration guide. * Add missing tests.
| * | | | Add always_permitted_parameters as an option.Rafael Chacón2014-06-263-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This commit adds back the always_permitted_parameters configuration option to strong paramaters. * The initial pull requests where this feature was added are the following: - https://github.com/rails/rails/pull/12682 - https://github.com/rails/strong_parameters/pull/174
* | | | | Merge pull request #15946 from jamesprior/patch-1Rafael Mendonça França2014-06-271-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Update documentation for run_callbacks
| * | | | | Update documentation for run_callbacksjamesprior2014-06-271-1/+2
| | | | | | | | | | | | | | | | | | In some cases run_callbacks will return nil. I'm attempting to update the documentation for the method to clarify.
* | | | | | Do not change the global state of the test suiteRafael Mendonça França2014-06-272-18/+2
|/ / / / /
* | | | | Improve tests to use add_foreign_key DSLRafael Mendonça França2014-06-271-18/+11
| | | | |
* | | | | MySQL doesn't works with foreign keyRafael Mendonça França2014-06-271-3/+2
| | | | |
* | | | | We are talking about the libraries, not the constantsSean Griffin2014-06-271-3/+3
| | | | |
* | | | | Note that `_will_change!` is no longer needed for AR instancesSean Griffin2014-06-271-3/+5
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Leave the note for `ActiveModel`, since it can't yet detect mutations (hopefully we can change this in time for 4.2). However, we now detect mutations on all supported types in `ActiveRecord`, so we can note that `_will_change!` is no longer needed there.
* | | | Talk about config.assts.version move tooRafael Mendonça França2014-06-271-1/+1
| | | | | | | | | | | | | | | | Closes #15942
* | | | Merge pull request #12450 from iantropov/masterRafael Mendonça França2014-06-275-5/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug, when ':dependent => :destroy' violates foreign key constraints Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/associations/builder/association.rb activerecord/lib/active_record/associations/builder/has_one.rb
| * | | | Fix bug, when ':dependent => :destroy' option violates foreign key ↵Ivan Antropov2013-10-265-9/+61
| | | | | | | | | | | | | | | | | | | | constraints, issue #12380
* | | | | Merge pull request #15788 from sgrif/sg-mutable-stringsRafael Mendonça França2014-06-275-13/+77
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Detect in-place modifications on Strings
| * | | | | Detect in-place modifications on StringsSean Griffin2014-06-174-13/+55
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 19:09:21 +0000