aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'dilizarov-feature/alias_request_uuid_method_to_request_id'Rafael Mendonça França2015-02-206-10/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Prefer request_id over uuid and test the aliasRafael Mendonça França2015-02-204-10/+14
| * | | | | | | | | | | Aliased the ActionDispatch::Request#uuid method with ActionDispatch::Request#...David Ilizarov2015-02-203-1/+9
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #17069 from modosc/masterRafael Mendonça França2015-02-201-7/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Improve shorthand matching for routesbrainopia2015-01-252-1/+10
* | | | | | | | | | | | | 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
* | | | | | | | | | | | | 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 Associat...Ben Woosley2014-09-289-32/+66
* | | | | | | | | | | | | | 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`.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 down to a class-level ivar wit...Ben Woosley2014-09-221-20/+18
* | | | | | | | | | | | | | | | Merge pull request #19017 from mcmorgan/active-job-docs-use-sentence-case-for...Rafael Mendonça França2015-02-201-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Use sentence case for consistency in commentsMarcel Morgan2015-02-201-5/+5
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | 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 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 becomesMiklos Fazekas2015-02-043-1/+14
* | | | | | | | | | | | | | | | Merge pull request #17143 from kuldeepaggarwal/fix-mailToRafael Mendonça França2015-02-202-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | do not generate blank options in mailToKuldeep Aggarwal2014-10-022-2/+8
* | | | | | | | | | | | | | | | | Merge pull request #18914 from kamipo/format_time_according_to_precisionRafael Mendonça França2015-02-2013-44/+168
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | 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 optionSean Griffin2015-01-232-8/+36
* | | | | | | | | | | | | | | | | | | 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 regexpSergey Kojin2014-10-021-1/+1
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | 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 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_tagLeandro Nunes2015-02-201-2/+1
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | 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]yuuji.yaginuma2015-02-203-3/+3
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #19007 from evanphx/route_proxyRafael Mendonça França2015-02-193-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Make the helpers a required argumentEvan Phoenix2015-02-192-3/+3
| * | | | | | | | | | | | | | | | | | | Cache url_helpers instead of creating each timeEvan Phoenix2015-02-192-5/+8
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | 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 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]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 [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` methodsWojciech Wnętrzak2015-02-196-10/+43