Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | updated squash docs-section [ci skip] | Gourav Tiwari | 2015-05-19 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I happen to squash my couple of commits and when followed steps from guide, I observed that I have to give a commit id after which I want to squash. If I don't provide one it picks last 3 commits, which might not include my commits to squash. Refer: http://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git | |||||
* | | | | | | Merge pull request #20157 from tak1n/master | Rafael Mendonça França | 2015-05-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Clarify view tests | |||||
| * | | | | | | Clarify view tests [ci skip] | Benjamin Klotz | 2015-05-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention that view tests are made in controller tests. | |||||
* | | | | | | | updating the links, they were removed in cc30f5f9 [ci skip] | Ankit Gupta | 2015-05-19 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | new links as per pull request comment #20160 (OWASP guides) | |||||
* | | | | | | | Merge pull request #20178 from ↵ | Santiago Pastorino | 2015-05-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vngrs/fix_wrong_default_value_of_javascript_engine config.generators javascript_engine default value is :js not nil | |||||
| * | | | | | | | config.generators javascript_engine default value is :js not nil [ci skip] | Mehmet Emin İNAÇ | 2015-05-17 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | add missing documentation about generators resource_route [ci skip] | Mehmet Emin İNAÇ | 2015-05-17 | 1 | -0/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | [ci skip] remove unnecessary mention to Test::Unit from docs | Roque Pinel | 2015-05-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the guide to state that Rails uses Minitest as the default test framework. Remove unnecessary mention to Test::Unit from the API docs ('constantize' and 'safe_constantize'). | |||||
* | | | | | | | [ci skip] Improve grammar/syntax in AR validations docs. | Tim Wade | 2015-05-16 | 1 | -12/+12 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Dead blog/site links [ci skip] | Ankit Gupta | 2015-05-14 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | [ci skip] Improve phrasing in AR migrations docs. | Tim Wade | 2015-05-13 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * insert 'and' into a poorly formed sentence. * avoid using 'reverse' twice in the same sentence (which would indicate the opposite of what is meant) | |||||
* | | | | | Merge pull request #20119 from yui-knk/fix/active_record_querying | Yves Senn | 2015-05-12 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | [ci skip] Fix `transaction` code example | |||||
| * | | | | [ci skip] Fix `transaction` code example | yui-knk | 2015-05-12 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Fix default value in guide [ci skip] | Kohei Suzuki | 2015-05-12 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | [ci skip] Improve phrasing on #explain pretty printing. | Tim Wade | 2015-05-10 | 1 | -2/+3 | |
| | | | | | ||||||
* | | | | | [ci skip] Fix purpose of `assert_kind_of` | yui-knk | 2015-05-10 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #20087 from kuldeepaggarwal/fix-engine-guides | Yves Senn | 2015-05-09 | 1 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | correct error text message in engines.md [ci skip] | |||||
| * | | | | [CI SKIP] correct error text message | kuldeepaggarwal | 2015-05-09 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | promote :except option instead of :only for before action docs [ci skip] | Faruk AYDIN | 2015-05-09 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #20079 from ankit8898/aj_all | Arun Agrawal | 2015-05-08 | 1 | -0/+1 | |
|\ \ \ \ | |_|/ / |/| | | | docs: syncing with the code, adding aj [ci skip] | |||||
| * | | | docs: syncing with the code, adding aj [ci skip] | Ankit Gupta | 2015-05-08 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-05-08 | 5 | -13/+13 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Updated titles of headers in Action Mailer guide | Prathamesh Sonpatki | 2015-04-28 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Replaced Javascript with JavaScript in guides | Prathamesh Sonpatki | 2015-04-28 | 2 | -2/+2 | |
| | | | | ||||||
| * | | | Fix method name for building associated object in nested_model_forms guide | Prathamesh Sonpatki | 2015-04-25 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | [ci skip] fix count of options for `find_each` | Mikhail Dieterle | 2015-04-23 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | [ci skip] `deep_dup` is instance method of `Hash` | yui-knk | 2015-04-22 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | [ci skip] `deep_dup` is instance method of `Array` | yui-knk | 2015-04-21 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | [ci skip] Fix returned values of code sample | yui-knk | 2015-04-19 | 1 | -6/+6 | |
| | | | | ||||||
* | | | | added activejob in list [ci skip] | Ankit Gupta | 2015-05-07 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Typo fix [ci skip] | Ankit Gupta | 2015-05-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Single brackets | |||||
* | | | | [skip ci] Fix typos in actionpack changelog and security guide | Anton Davydov | 2015-05-07 | 1 | -1/+1 | |
| |_|/ |/| | | ||||||
* | | | s/snipped/snippet for @senny :trollface: | Zachary Scott | 2015-05-06 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #20040 from ankit8898/route | Zachary Scott | 2015-05-06 | 1 | -0/+2 | |
|\ \ \ | | | | | | | | | Docs: Adding a note, snipped for brevity [ci skip] | |||||
| * | | | Adding a note, snipped for brevity | Ankit Gupta | 2015-05-05 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | sudden ending of form looks incomplete and catches [ci skip] | |||||
* | | | | docs, fix spelling. refs #20040 [ci skip] | Yves Senn | 2015-05-06 | 1 | -4/+4 | |
|/ / / | ||||||
* | | | Using the real C and R def of Crud [ci skip] | Ankit gupta | 2015-05-05 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #20031 from trayo/master | Zachary Scott | 2015-05-05 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fixes some words missing from the contributing guide [ci skip] | |||||
| * | | | fixes some words missing | Travis Yoder | 2015-05-04 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Tiny grammar correction in documentation [ci skip] | Ankit gupta | 2015-05-05 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #19868 from createdbypete/guides-postgres-uuid-pgcrypto | Yves Senn | 2015-05-05 | 1 | -6/+9 | |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | Provide mention of pgcrypto extension for Postgres UUID support [ci skip] | |||||
| * | | | Provide mention of pgcrypto extension for uuids | Peter Rhoades | 2015-05-04 | 1 | -6/+9 | |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | From the Postgresql 9.4+ docs > If you only need randomly-generated (version 4) UUIDs, consider using the gen_random_uuid() function from the pgcrypto module instead. [ci skip] | |||||
* | | | Enhance the "Passing Variables to Translations" part | Evan Prothro | 2015-05-04 | 1 | -19/+48 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more information about passing variables to translation definitions and also merge this part with the "Interpolation" one as the latter didn't bring any new information. Moreover, each one was referring to the other for further information. [ci skip] | |||||
* | | | Updates various prose to the i18n guide | Evan Prothro | 2015-05-04 | 1 | -49/+57 | |
| | | | | | | | | | | | | [ci skip] | |||||
* | | | Merge pull request #19972 from ↵ | Rafael Mendonça França | 2015-05-03 | 1 | -0/+14 | |
|\ \ \ | | | | | | | | | | | | | | | | | robertjlooby/document_habtm_changes_in_upgrade_guide add upgrade note for breaking habtm change in 3.2 -> 4.0 | |||||
| * | | | add note about habtm relations with scopes | Rob Looby | 2015-05-03 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | add upgrade note for breaking habtm change in 3.2 -> 4.0 | Rob Looby | 2015-05-01 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The has_and_belongs_to_many default join_table behavior changed between Rails 3.2 and Rails 4.0 and should be noted in the appropriate section of the upgrade guide. commit: https://github.com/rails/rails/commit/46492949b8c09f99db78b9f7a02d039e7bc6a702 | |||||
* | | | | Merge pull request #19982 from acapilleri/scope_uniquiness | Yves Senn | 2015-05-03 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | [ci skip] Uniquiness with scope can have one or more arguments | |||||
| * | | | | [ci skip] Uniquiness with scope can have one or more arguments | Angelo Capilleri | 2015-05-03 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Fix method call typo [ci skip] | Zachary Scott | 2015-05-02 | 1 | -1/+1 | |
| | | | |