Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Constant autoload grammar fix | Jon Atack | 2014-12-16 | 1 | -2/+2 | |
|/ / / / / / | | | | | | | | | | | | | [skip ci] | |||||
* | | | | | | docs, synchronize CHANGELOG across branches. [ci skip] | Yves Senn | 2014-12-16 | 1 | -11/+12 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #18047 from ↵ | Abdelkader Boudih | 2014-12-16 | 1 | -5/+0 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JuanitoFatas/patch/constant_autoloading_and_reloading-list-items [ci skip] :scissors: blank lines between list items. | |||||
| * | | | | | | [ci skip] :scissors: blank lines between list items. | Juanito Fatas | 2014-12-16 | 1 | -5/+0 | |
| | |_|/ / / | |/| | | | | ||||||
* / | | | | | decribe deprecation cycle from `timestamps null: false` to `null: true`. | Yves Senn | 2014-12-16 | 1 | -0/+4 | |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] /cc @sgrif @zzak Conflicts: activerecord/CHANGELOG.md | |||||
* | | | | | undoes a recent merged edit [ci skip] | Xavier Noria | 2014-12-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | I think "What" is was fine, "The purpose of" assumes the reader knows such thing exists. "What is" is fine, and also matches the following "What is require_dependency". | |||||
* | | | | | missing preposition [ci skip] | Xavier Noria | 2014-12-16 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | syncs the autoloading guide and undoes some merged changes [ci skip] | Xavier Noria | 2014-12-16 | 1 | -17/+16 | |
| | | | | | ||||||
* | | | | | Remove this tip, if the previous statement is true.. ie: The reader sees "Rails | Zachary Scott | 2014-12-15 | 1 | -5/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.2.0", then they should have no problems hacking with Rails. [ci skip] If they do, then its a bug and it should be reported. | |||||
* | | | | | Merge pull request #17992 from andreynering/guides-intallation | Zachary Scott | 2014-12-15 | 1 | -6/+11 | |
|\ \ \ \ \ | | | | | | | | | | | | | Improving tips about installation in the guides [ci skip] | |||||
| * | | | | | Improving tips about installation in the guides [ci skip] | Andrey Nering | 2014-12-12 | 1 | -6/+11 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'jonatack-patch-8' [ci skip] | Zachary Scott | 2014-12-15 | 1 | -7/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Merge branch 'patch-8' of https://github.com/jonatack/rails into ↵ | Zachary Scott | 2014-12-15 | 1 | -7/+9 | |
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jonatack-patch-8 [ci skip] Conflicts: guides/source/constant_autoloading_and_reloading.md | |||||
| * | | | | | | Update constant_autoloading_and_reloading.md | Jon Atack | 2014-12-15 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci] Follow-up to previous commit [skip ci] Fix previous merge [skip ci] | |||||
* | | | | | | | Merge pull request #18046 from stephenminded/counter_cache_docs_fix | Arthur Nogueira Neves | 2014-12-15 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Counter cache Rails guides fix | |||||
| * | | | | | | | You need to specify the counter_cache option on the has_many side of the ↵ | Steve Lounsbury | 2014-12-16 | 1 | -1/+7 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | association when using a custom counter cache column. This is documented on the has_many association here: http://apidock.com/rails/ActiveRecord/Associations/ClassMethods/has_many [ci skip] | |||||
* | | | | | | | Add CHANGELOG for #18034 [ci skip] | Zachary Scott | 2014-12-15 | 1 | -0/+4 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #18034 from andreynering/ar-guides-querying | Zachary Scott | 2014-12-15 | 1 | -0/+35 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Adding method chaining section on ActiveRecord querying guide [ci skip] | |||||
| * | | | | | | | Adding method chaining section on ActiveRecord querying guide [ci skip] | Andrey Nering | 2014-12-15 | 1 | -0/+35 | |
| | | | | | | | | ||||||
* | | | | | | | | Ruby will allocate the class as a side-effect, since it is already defined. | Zachary Scott | 2014-12-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | | | | Merge pull request #18040 from jonatack/patch-11 | Zachary Scott | 2014-12-15 | 1 | -10/+9 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | Improve autoload_paths section [ci skip] | |||||
| * | | | | | | | Improve autoload_paths section | Jon Atack | 2014-12-15 | 1 | -10/+9 | |
| | |/ / / / / | |/| | | | | | | | | | | | | [skip ci] | |||||
* | | | | | | | Merge pull request #18043 from claudiob/minor-autoloading-guides-fixes | Abdelkader Boudih | 2014-12-16 | 1 | -8/+8 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Minor typos/fixes to autoloading guide | |||||
| * | | | | | | | Minor typos/fixes to autoloading guide | claudiob | 2014-12-15 | 1 | -8/+8 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @fxn Great job with the guide, I read it all! Yeah! Some paragraphs might be restructured, but I'll leave that to you since you are currently working on it. This commit only includes some minor typos and commas that in my opinion clarify the reading. [ci skip] | |||||
* | | | | | | | Regression test for #18024 | Santiago Pastorino | 2014-12-15 | 1 | -0/+5 | |
| | | | | | | | ||||||
* | | | | | | | Revert "Re-enable capture'ing non-String values" | Santiago Pastorino | 2014-12-15 | 4 | -15/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c2fe0938d7201d4ce0bb2f25e72bf5f70df128af. | |||||
* | | | | | | | Merge pull request #16924 from Sinjo/params-deep-munge-empty-array | Godfrey Chan | 2014-12-15 | 7 | -23/+21 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Don't convert empty arrays to nils when deep munging params | |||||
| * | | | | | | | Don't convert empty arrays to nils when deep munging params | Chris Sinjakli | 2014-12-15 | 7 | -23/+21 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | autoloading guide: applies some Strunk & White and hyperlinking [ci skip] | Xavier Noria | 2014-12-15 | 1 | -101/+80 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #18041 from andreynering/ar-guides-querying-2 | Rafael Mendonça França | 2014-12-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Dynamic finders already deprecated [ci skip] | |||||
| * | | | | | | Already deprecated [ci skip] | Andrey Nering | 2014-12-15 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #18038 from seuros/typofix | Rafael Mendonça França | 2014-12-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix a typo [ci skip] | |||||
| * | | | | | | fix a typo [ci skip] | Abdelkader Boudih | 2014-12-15 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-12-15 | 3 | -6/+41 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | [ci skip] Fix output of video_tag helper | Anton Cherepanov | 2014-12-07 | 1 | -1/+4 | |
| | | | | | | | ||||||
| * | | | | | | Better doc for AS::DateTime#seconds_since_midnight | claudiob | 2014-12-04 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds examples and keeps coherent with the documentation of the similar method `seconds_until_end_of_day`. [ci skip] | |||||
| * | | | | | | Merge branch 'document-time-with-zone-plus-and-minus' | claudiob | 2014-12-04 | 1 | -4/+32 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Add docs for AS::TimeWithZone + and - | claudiob | 2014-12-04 | 1 | -4/+32 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example was taken from the commit message 676d6a6. [ci skip] | |||||
| * | | | | | | Merge branch 'master' of github.com:rails/rails | Vijay Dev | 2014-11-30 | 396 | -4136/+3261 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Fix grammar on ActiveRecord::AttributeMethods doc. | Hendy Tanata | 2014-11-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | | | [Testing guide] Using "Fixtures API" consistently | Prathamesh Sonpatki | 2014-11-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - In guides, "API" is used consistently instead of "api". - Reason behind replacing "fixtures API" to "Fixtures API" is because here we are referring to the concept of "fixtures". In other places in the guide "fixture" OR "fixtures" is referred to the single or multiple instances of test data. - This is also followup of https://github.com/rails/docrails/commit/aa9d1332b20305dd860b21a7ada06c5252bebad5#commitcomment-8497376. | |||||
| * | | | | | | | [Testing guide] Use "Fixtures API" instead of "fixture api". | Prathamesh Sonpatki | 2014-11-10 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | fix a typo [ci skip] | Vijay Dev | 2014-12-15 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | autoloading guide: adds nesting rule for Kernel#load [ci skip] | Xavier Noria | 2014-12-15 | 1 | -2/+5 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #18026 from hbd225/fix_duplicate_web-console_entries | Rafael Mendonça França | 2014-12-15 | 3 | -10/+22 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix Duplicate web-console entries in Gemfile | |||||
| * | | | | | | | | Fix Duplicate web-console entries in Gemfile | NorimasaAndo | 2014-12-14 | 3 | -10/+22 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #18035 from claudiob/minor-typos-in-autoloading-guide | Rafael Mendonça França | 2014-12-15 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix minor typos in autoloading guide [ci skip] | |||||
| * | | | | | | | | | Fix minor typos in autoloading guide | claudiob | 2014-12-15 | 1 | -5/+5 | |
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* / | | | | | | | | autoloading guide: some rewordings [ci skip] | Xavier Noria | 2014-12-15 | 1 | -25/+25 | |
|/ / / / / / / / | ||||||
* | | | | | | | | autoloading guide: more refinements [ci skip] | Xavier Noria | 2014-12-15 | 1 | -10/+11 | |
| | | | | | | | |