aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19046 from yui-knk/fix/ormAbdelkader Boudih2015-02-231-1/+1
|\ | | | | [ci skip] Fix `Object-Relational` to `Object Relational`
| * [ci skip] Fix `Object-Relational` to `Object Relational`yui-knk2015-02-241-1/+1
|/
* Merge pull request #18937 from simi/optional-belongs-toRafael Mendonça França2015-02-2314-10/+166
|\ | | | | Require `belongs_to` by default.
| * Require `belongs_to` by default.Josef Šimánek2015-02-2114-10/+166
| | | | | | | | Deprecate `required` option in favor of `optional` for belongs_to.
* | Merge pull request #19032 from jvanbaarsen/changed-ajadapter-env-varRafael Mendonça França2015-02-236-7/+7
|\ \ | | | | | | Changed the AJADAPTER to AJ_ADAPTER
| * | Changed the AJADAPTER to AJ_ADAPTERJeroen van Baarsen2015-02-226-7/+7
| | | | | | | | | | | | | | | | | | | | | * This allows for easier reading, since those are two words, so they should be split by _ Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Merge pull request #19044 from y-yagi/mime_type_docAbdelkader Boudih2015-02-231-1/+1
|\ \ \ | |_|/ |/| | fix method name in mime type example. `Mime::Type.[]` doesn't exist. [ci skip]
| * | fix method name in mime type example. `Mime::Type.[]` doesn't exist. [ci skip]yuuji.yaginuma2015-02-231-1/+1
|/ /
* | Minor guides edits [ci skip]Robin Dupret2015-02-212-24/+23
| |
* | Merge pull request #19026 from rousisk/masterRobin Dupret2015-02-211-2/+3
|\ \ | | | | | | Improve wording on find_by note regarding returning only one record [ci skip]
| * | Improve wording on find_by note regarding returning only one record [ci skip]Konstantinos Rousis2015-02-211-2/+3
|/ /
* | [ci skip] Use explicit module namespace in guideKasper Timm Hansen2015-02-211-1/+3
| | | | | | | | | | | | | | The Engines guide used an inline namespace, `Blorgh::ApplicationController`, which caused problems for users using an explicit module namespace because the `ApplicationController` inherited from wasn't fully qualified. The controller qualification was fixed in 661479324d573d419d8e15a1ea257e01856084af. This ditches the inline namespace and makes the example more consistent with others in the guide.
* | guides, fully qualify `ApplicationController`. Closes #19024.Yves Senn2015-02-211-1/+1
| |
* | Merge pull request #19023 from trliner/fix_has_secure_token_docsAbdelkader Boudih2015-02-211-2/+2
|\ \ | | | | | | Fix #has_secure_token documentation
| * | Fix #has_secure_token documentation [ci skip]Tim Liner2015-02-201-2/+2
|/ / | | | | | | | | It's actually #validates_uniqueness_of that can generate a race condition rather than #validates_presence_of.
* | Merge pull request #17558 from OpenSourceProjects/test_error_messagesRafael Mendonça França2015-02-207-10/+19
|\ \ | | | | | | | | | Error message testing fix
| * | Error message testing fixFranky W2015-02-207-10/+19
|/ / | | | | | | | | | | | | | | | | The testing of error messages have been implemented wrongly a few times. This is an attempt to fix it. For example, some of these test should have failed with the new code. The reason they are not failling with the new string is the fact they were not being tested beforehand.
* | Oops :bomb:Rafael Mendonça França2015-02-201-1/+1
| |
* | Change the deprecation messages to show the preferred way to work withRafael Mendonça França2015-02-204-12/+12
| | | | | | | | ActiveModel::Errors
* | Fix changelog indent [ci skip]Carlos Antonio da Silva2015-02-201-2/+2
| |
* | Merge branch 'dilizarov-feature/alias_request_uuid_method_to_request_id'Rafael Mendonça França2015-02-206-10/+22
|\ \ | | | | | | | | | Fixes #16518
| * | Prefer request_id over uuid and test the aliasRafael Mendonça França2015-02-204-10/+14
| | |
| * | Aliased the ActionDispatch::Request#uuid method with ↵David Ilizarov2015-02-203-1/+9
|/ / | | | | | | ActionDispatch::Request#request_id
* | Merge pull request #17069 from modosc/masterRafael Mendonça França2015-02-201-7/+9
|\ \ | | | | | | move cache_digests rake methods into their own namespace
| * | move cache_digests rake methods into their own namespacejonathan schatz2014-09-261-7/+9
| | |
* | | Merge pull request #18218 from brainopia/fix_match_shorthand_in_routesRafael Mendonça França2015-02-202-1/+10
|\ \ \ | | | | | | | | Don't use shorthand match on routes with inappropriate symbols
| * | | Improve shorthand matching for routesbrainopia2015-01-252-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shorthand route match is when controller and action are taken literally from path. E.g. get '/foo/bar' # => will use 'foo#bar' as endpoint get '/foo/bar/baz' # => will use 'foo/bar#baz' as endpoint Not any path with level two or more of nesting can be used as shortcut. If path contains any characters outside of /[\w-]/ then it can't be used as such. This commit ensures that invalid shortcuts aren't used. ':controller/:action/postfix' - is an example of invalid shortcut that was previosly matched and led to exception: "ArgumentError - ':controller/:action' is not a supported controller name"
* | | | Merge branch 'rm-take' into 4-1-stableRafael Mendonça França2015-02-203-1/+43
| | | |
* | | | s/around_filter/around_action/Akira Matsuda2015-02-211-1/+1
| | | |
* | | | Do not test, document or use a private API methodRafael Mendonça França2015-02-203-28/+0
| | | | | | | | | | | | | | | | These methods are nodoc so we should not document them.
* | | | Merge pull request #16989 from Empact/reload-cache-clearRafael Mendonça França2015-02-206-28/+53
|\ \ \ \ | | | | | | | | | | | | | | | Isolate access to @associations_cache and @aggregations_cache to the Associations and Aggregations modules, respectively.
| * | | | Isolate access to @associations_cache and @aggregations cache to the ↵Ben Woosley2014-09-289-32/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Associations and Aggregations modules, respectively. This includes replacing the `association_cache` accessor with a more limited `association_cached?` accessor and making `clear_association_cache` and `clear_aggregation_cache` private.
* | | | | Merge pull request #19018 from lucasmazza/lm-activemodel-validate-bangRafael Mendonça França2015-02-204-14/+55
|\ \ \ \ \ | | | | | | | | | | | | Move the `validate!` method to `ActiveModel::Validations`.
| * | | | | Move the `validate!` method to `ActiveModel::Validations`.Lucas Mazza2015-02-204-14/+55
| | | | | |
* | | | | | Merge pull request #16993 from Empact/simplify-find_by-statement-cacheRafael Mendonça França2015-02-201-16/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Simplify find_by_statement_cache interaction
| * | | | | | Simplify `find_by_statement_cache` interaction down to a class-level ivar ↵Ben Woosley2014-09-221-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | with a single accessor `cached_find_by_statement`.
* | | | | | | Merge pull request #19017 from ↵Rafael Mendonça França2015-02-201-5/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | mcmorgan/active-job-docs-use-sentence-case-for-comment-consistency Active Job Guide: Use sentence case for consistency in comments [ci skip]
| * | | | | | Use sentence case for consistency in commentsMarcel Morgan2015-02-201-5/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #19015 from antstorm/fix-cache-helper-erb-block-in-commentRafael Mendonça França2015-02-201-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix cache_helper comment ERB typo
| * | | | | | Fix cache_helper comment ERBAnthony Dmitriyev2015-02-201-2/+2
| | | | | | |
* | | | | | | Merge pull request #17139 from mfazekas/fix_becomes_changed_attributesRafael Mendonça França2015-02-203-1/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | Always reset changed attributes in becomes
| * | | | | | Always reset changed attributes in becomesMiklos Fazekas2015-02-043-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When ```becomes``` changes @attributes it should also change @changed_attributes. Otherwise we'll experience a kind of split head situation where attributes are coming from ```self```, but changed_attributes is coming from ```klass.new```. This affects the inheritance_colmn as it's changed by new for example. Fixes #16881
* | | | | | | Merge pull request #17143 from kuldeepaggarwal/fix-mailToRafael Mendonça França2015-02-202-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mail_to helper method fix
| * | | | | | | do not generate blank options in mailToKuldeep Aggarwal2014-10-022-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when mail_to generate blank options for any passed options(cc, bcc, body, subject) then MICROSOFT OUTLOOK treats it differently and set wrong values in different options.
* | | | | | | | Merge pull request #18914 from kamipo/format_time_according_to_precisionRafael Mendonça França2015-02-2013-44/+168
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Format the time string according to the precision of the time column
| * | | | | | | | Add schema dumping tests for datetime and time precisionRyuta Kamizono2015-02-203-8/+34
| | | | | | | | |
| * | | | | | | | Format the time string according to the precision of the time columnRyuta Kamizono2015-02-207-22/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is also necessary to format a time column like a datetime column.
| * | | | | | | | Allow `:precision` option for time type columnsRyuta Kamizono2015-02-208-14/+89
| | | | | | | | |
* | | | | | | | | Merge pull request #18665 from sgrif/sg-test-route-allSean Griffin2015-02-202-8/+36
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow `method: "all"` as a valid routing test option
| * | | | | | | | | Allow `method: "all"` as a valid routing test optionSean Griffin2015-01-232-8/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the test to mirror the production code, since `via: :all` is a valid option. The behavior in 4.1 did not actually test that it matched all verbs, but instead defaulted to testing for "GET". This implementation aims to better handle the intention of passing "all". What will actually be asserted doesn't quite match up with the generated route, since it appears to just not create a constraint on the method. However, I don't think that we can easily test the lack of that constraint. Testing each of the main 4 HTTP verbs seems to be a reasonably close approximation, which should be sufficient for our needs. Fixes #18511.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 21:18:04 +0000