aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Omit directories from gemspec.files for RubyGems 2 compat."Jeremy Kemper2012-12-097-7/+7
| | | | | | Obviated by rubygems/rubygems@486ed83cc8e706069213c5d406122f4cfcca9e7f This reverts commit bb8923dee093b615615cdfb83b34d1b0bb254f25.
* Move to the schema-migrations-metadata branch.Jeremy Kemper2012-12-0915-266/+60
| | | | | | | | | | | | | | | | | | | | | | | | Pending work on graceful app upgrades. Revert "Merge pull request #8439 from joshsusser/fixes" This reverts commit ce8ac39338f86388e70356b3a470b3ea443802ae, reversing changes made to b0e7b6f67c984d4b1502e801781ed75fad681633. Revert "Merge pull request #8431 from joshsusser/schemadump" This reverts commit 036d3e1c2b65c4b8cbd23de2e20ad67b9b756182, reversing changes made to 0c692f4d121792117b6a71e5ed590a31c3b9d12e. Revert "Merge branch 'joshsusser-master' into merge" This reverts commit 0c692f4d121792117b6a71e5ed590a31c3b9d12e, reversing changes made to 2e299fca715b083a60222a85e48f9d3b8dd8ce93. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/schema_dumper_test.rb
* revise block on kindle guides [ci skip]Vijay Dev2012-12-091-3/+1
|
* Remove the spaces after the open bracket and before the close bracket.Rafael Mendonça França2012-12-091-1/+1
| | | | All our generated code follow this rule
* Merge pull request #8469 from kytrinyx/explicit-mysql-instructionsRafael Mendonça França2012-12-091-0/+3
|\ | | | | | | | | Include command to create mysql user [ci skip]
| * Include command to create mysql userKatrina Owen2012-12-091-0/+3
| | | | | | | | | | The guide mentions that the 'rails' user is needed, but doesn't explicitly include the command to do so.
* | Revert "API reader should look elsewhere for helper instructions"Vijay Dev2012-12-091-24/+0
| | | | | | | | | | | | | | | | | | This reverts commit ba2d867b2961b5ef72aad353c2d647b04654cbe3. Reason: https://github.com/lifo/docrails/commit/ba2d867b2961b5ef72aad353c2d647b04654cbe3#commitcomment-2276670 [ci skip]
* | Merge pull request #8466 from gclag/stats-handle-new-test-locationsJeremy Kemper2012-12-081-1/+7
|\ \ | | | | | | Make rake task for code statistics handle new test locations properly
| * | Make code statistics rake task handle new test locations properlyGeorge Claghorn2012-12-091-1/+7
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of 2a68f68aead9fd65ecac8062ca8efc15f5bab418: - Unit tests are now in test/models, instead of test/units - Functional tests are now in test/controllers, instead of test/functional - Helper tests are now in test/helpers, instead of test/units/helpers - Mailer tests are now in test/mailers, instead of test/functional Update the rake task for code statistics (`rake stats`) so that it recognizes files in the above locations as tests, and accurately calculates statistics such as "Test LOC" and "Code to Test Ratio." Safely handle Rails apps that still have tests in the old locations.
* | Omit directories from gemspec.files for RubyGems 2 compat.Jeremy Kemper2012-12-087-7/+7
| | | | | | | | | | | | RG2 packager expects each spec.files path to be a file and bombs when it tries to tarball a dir. May revert if rubygems/rubygems#413 is accepted.
* | Fix method assertion ensuring it will match "end" with the same indentationCarlos Antonio da Silva2012-12-081-2/+2
| | | | | | | | | | Otherwise it was matching "end" lines from blocks within the method body, making tests such as the migration ones fail.
* | Merge pull request #8346 from sodabrew/patch-1Jeremy Kemper2012-12-088-34/+144
|\ \ | | | | | | Add `variables:` to database.yml for mysql, mysql2, and postgresql adapters
| * | Session variables for mysql, mysql2, and postgresql adapters can be setAaron Stone2012-12-088-34/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | in the new 'variables:' hash in each database config section in database.yml. The key-value pairs of this hash will be sent in a 'SET key = value, ...' query on new database connections. The configure_connection methods from mysql and mysql2 into are consolidated into the abstract_mysql base class.
* | | Merge pull request #8348 from danchoi/masterVijay Dev2012-12-084-5/+128
|\ \ \ | | | | | | | | Kindle ebook generation with working section navigation
| * | | Add periodical-style TOC and navigation to Kindle version of guidesDaniel Choi2012-12-014-5/+128
| | | |
* | | | update release notes [ci skip]Vijay Dev2012-12-081-1/+41
| |/ / |/| |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-0832-172/+196
|\ \ \
| * | | copy edits [ci skip]Vijay Dev2012-12-082-4/+3
| | | |
| * | | Revert "Introduce Bundler and Gemfiles in a NOTE"Vijay Dev2012-12-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 83cb6fbd13f3c5ea3106b9a57964b1a6fb243682. Reason: very trivial [ci skip]
| * | | Fill out API Documentation Guidelines 'you will learn' list.Steve Klabnik2012-12-071-0/+4
| | | |
| * | | Fill out Active Support Core Extensions 'you will learn' list.Steve Klabnik2012-12-071-0/+5
| | | |
| * | | Remove reference to background queue in mailer guide.Steve Klabnik2012-12-071-2/+0
| | | | | | | | | | | | | | | | | | | | Mailers are always async now, and we already discuss queueing lower down in the guide.
| * | | Remove references to Rails versions.Steve Klabnik2012-12-0713-59/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no reason for guides to reference old behaviors. They should be current as of the versions of Rails that they ship with, and including older information just clutters thing. I discussed this change with @fxn and he agrees.
| * | | Update activesupport/lib/active_support/deprecation/proxy_wrappers.rbClaudio B.2012-12-071-1/+1
| | | | | | | | | | | | Fix a typo in rdoc (*expect* for *except*)
| * | | Punctuation, capitalization, grammar fixes in rails guidesKatie Oldaker2012-12-077-15/+19
| | | |
| * | | Fix small grammatical errorMax Katz2012-12-071-1/+1
| | | |
| * | | Fixed grammar in a lot of guide prologues.Katie Oldaker2012-12-0722-88/+88
| | | |
| * | | Added overview items to Guides Guidelines prologueIan C. Anderson2012-12-071-0/+3
| | | |
| * | | changing tense, since Rails 3.2 has been releasedDrew Dara-Abrams2012-12-061-1/+1
| | | |
| * | | API reader should look elsewhere for helper instructionsThiago Pinto2012-12-061-0/+24
| | | |
| * | | complementary options guidelines for f.file_field and file_field_tagThiago Pinto2012-12-062-0/+8
| | | |
| * | | adding example for f.file_inputThiago Pinto2012-12-061-0/+3
| | | |
| * | | adding example for f.file_inputThiago Pinto2012-12-061-0/+3
| | | |
| * | | correct bad jquery syntaxThiago Pinto2012-12-061-2/+2
| | | |
| * | | Introduce Bundler and Gemfiles in a NOTEPablo Torres2012-12-051-0/+2
| | | |
| * | | Define a generator before referring to itPablo Torres2012-12-041-1/+1
| | | |
| * | | Correct bad EnglishPablo Torres2012-12-041-2/+2
| | | |
| * | | Merge pull request #120 from tonytonyjan/patch簡煒航2012-12-041-1/+18
| |\ \ \ | | | | | | | | | | add a notice about loading assets in production mode
| | * | | add a notice about loading assets in production modeTony Jian2012-12-051-1/+18
| |/ / /
* | | | Fix scaffold controller generator testsCarlos Antonio da Silva2012-12-081-8/+6
| | | |
* | | | Improve where.not docs [ci skip]Carlos Antonio da Silva2012-12-081-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix example queries * Remove doc entries of where.like/not_like. * Remove :chain from where.not related docs. To me that's an implementation detail and we don't expect people to use where(:chain).not.
* | | | Merge pull request #8461 from frodsan/fix_assert_method_generatorsCarlos Antonio da Silva2012-12-081-1/+1
|\ \ \ \ | | | | | | | | | | Fix #assert_instance_method to also assert indented methods
| * | | | Fix #assert_instance_method to also assert indented methodsFrancesco Rodriguez2012-12-081-1/+1
| | | | |
* | | | | Merge pull request #8465 from frodsan/update_am_action_callbacksRafael Mendonça França2012-12-085-19/+19
|\ \ \ \ \ | | | | | | | | | | | | use _action callbacks in actionmailer
| * | | | | use _action callbacks in actionmailerFrancesco Rodriguez2012-12-085-19/+19
|/ / / / /
* | | | | Merge pull request #8395 from bmaland/attr_accessorsCarlos Antonio da Silva2012-12-081-23/+1
|\ \ \ \ \ | | | | | | | | | | | | Use attr_accessor for Rails.{application,cache,logger}
| * | | | | Use attr_accessor for Rails.{application,cache,logger}Bjørn Arild Mæland2012-12-011-23/+1
| | | | | |
* | | | | | Merge pull request #8457 from caike/masterCarlos Antonio da Silva2012-12-081-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update AR Changelog with correct example using includes [ci skip]
| * | | | | | Update AR Changelog with correct example using includesCaike Souza2012-12-081-4/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | These queries don't seem to work without the includes clause. [ci skip]
* | | | | | Merge pull request #8462 from frodsan/update_guides_action_callbacksCarlos Antonio da Silva2012-12-086-21/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update guides to use _action callbacks [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 23:28:08 +0000