aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | | | | | | Merge pull request #17144 from skojin/patch-doc-validation-format-z-regexpRafael Mendonça França2015-02-201-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix mistype in doc about \z regexp
| * | | | | | | | | fix mistype in doc about \z regexpSergey Kojin2014-10-021-1/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | replace \Z with regular \z
* | | | | | | | | Use a name that better reflect the return valueRafael Mendonça França2015-02-201-2/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #17138 from jpcody/rename_default_form_builderRafael Mendonça França2015-02-201-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename default_form_builder to avoid collision
| * | | | | | | | | Rename default_form_builder to avoid collisionJoshua Cody2014-10-011-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge pull request #19012 from LeandroSNunes/api_select_tagRafael Mendonça França2015-02-201-2/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Corrects the API to method select_tag
| * | | | | | | | | | Corrects the API to method select_tagLeandro Nunes2015-02-201-2/+1
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'selected' option is not doing what it should do. The expected behavior is to pass the value selected by default for the options_from_collection_for_select method
* | | | | | | | | | Merge pull request #19013 from y-yagi/custom_validators_exampleAbdelkader Boudih2015-02-203-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | use `messages` instead of deprecated `ActiveModel::Errors#[]=` method [ci skip]
| * | | | | | | | | use `messages` instead of deprecated `ActiveModel::Errors#[]=` method [ci skip]yuuji.yaginuma2015-02-203-3/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #19007 from evanphx/route_proxyRafael Mendonça França2015-02-193-6/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Cache url_helpers instead of creating each time
| * | | | | | | | | Make the helpers a required argumentEvan Phoenix2015-02-192-3/+3
| | | | | | | | | |
| * | | | | | | | | Cache url_helpers instead of creating each timeEvan Phoenix2015-02-192-5/+8
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has 2 effects: 1. RoutesProxy is CRAZY faster because it's no longer creating a new Module each time method_missing is hit. 2. It bypasses an existing bug in ruby that makes `class << obj` unsafe to be used in threading contexts.
* | | | | | | | | Merge pull request #19005 from meganemura/remove-last-empty-line-in-gemfileRafael Mendonça França2015-02-192-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove last empty line when we don't use Windows or JRuby
| * | | | | | | | | Remove last empty line when we don't use Windows or JRubymeganemura2015-02-202-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #19004 from danieldevries/fix-migration-fieldname-in-exampleAbdelkader Boudih2015-02-191-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix column name in migration example [ci skip]
| * | | | | | | | | fix column name in migration example [ci skip]Daniël de Vries2015-02-191-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #19002 from bdewater/patch-1Abdelkader Boudih2015-02-191-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix code sample for custom exception handler to match text [ci skip]
| * | | | | | | | | Fix code sample for custom exception handler [ci skip]Bart2015-02-191-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #18996 from morgoth/deprecate-more-errors-methodsYves Senn2015-02-196-10/+45
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate `ActiveModel::Errors` `add_on_empty` and `add_on_blank` methods
| * | | | | | | | | Deprecate `ActiveModel::Errors` `add_on_empty` and `add_on_blank` methodsWojciech Wnętrzak2015-02-196-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without replacement.
* | | | | | | | | | Merge pull request #18916 from kamipo/handle_array_option_in_type_to_sqlRafael Mendonça França2015-02-193-37/+32
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Handle array option in `type_to_sql`
| * | | | | | | | | | Handle array option in `type_to_sql`Ryuta Kamizono2015-02-191-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `[]` is a part of `sql_type`, so it is always necessary to respect to array option when `type_to_sql` is called.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 04:05:02 +0000