aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Change filter on /rails/info/routes to use an actual path regexp from railsbrainopia2015-02-237-99/+123
* some indenting and punctuation fixes. [ci skip]Yves Senn2015-02-234-29/+33
* Merge pull request #18395 from shunsukeaida/improve_generator_name_suggestionsRichard Schneeman2015-02-231-3/+1
|\
| * Improve generator name suggestions a bit.ShunsukeAida2015-02-221-3/+1
* | Merge pull request #19046 from yui-knk/fix/ormAbdelkader Boudih2015-02-231-1/+1
|\ \
| * | [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.Josef Šimánek2015-02-2114-10/+166
* | | Merge pull request #19032 from jvanbaarsen/changed-ajadapter-env-varRafael Mendonça França2015-02-236-7/+7
|\ \ \
| * | | Changed the AJADAPTER to AJ_ADAPTERJeroen van Baarsen2015-02-226-7/+7
* | | | 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]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]Konstantinos Rousis2015-02-211-2/+3
|/ / /
* | | [ci skip] Use explicit module namespace in guideKasper Timm Hansen2015-02-211-1/+3
* | | 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 [ci skip]Tim Liner2015-02-201-2/+2
|/ / /
* | | Merge pull request #17558 from OpenSourceProjects/test_error_messagesRafael Mendonça França2015-02-207-10/+19
|\ \ \
| * | | Error message testing fixFranky W2015-02-207-10/+19
|/ / /
* | | 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
* | | 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
|\ \ \
| * | | 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