Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'scaffold_fixes' | Rafael Mendonça França | 2012-12-10 | 10 | -22/+84 |
|\ | |||||
| * | Ensure the scaffold tests will pass when using references attributes | Rafael Mendonça França | 2012-12-10 | 1 | -0/+10 |
| | | |||||
| * | Add GeneratedAttribute#column_name to get the name of the column in the | Rafael Mendonça França | 2012-12-10 | 4 | -8/+19 |
| | | | | | | | | database | ||||
| * | Extract a attributes_names method to avoid duplication | Rafael Mendonça França | 2012-12-10 | 4 | -22/+12 |
| | | |||||
| * | Deal with polymorphic attributes correctly in the generators | Rafael Mendonça França | 2012-12-10 | 6 | -10/+41 |
| | | |||||
| * | Make references and belongs_to attributes to generate the _id column in | Rafael Mendonça França | 2012-12-10 | 2 | -2/+7 |
| | | | | | | | | fixtures | ||||
| * | Put the reference and belongs_to attributes in the scaffold tests. | Rafael Mendonça França | 2012-12-10 | 3 | -12/+9 |
| | | |||||
| * | Use the references and belongs_id ids in the scaffold_controller | Rafael Mendonça França | 2012-12-09 | 2 | -1/+10 |
| | | | | | | | | generator | ||||
| * | Add test case for scaffold_controller generator without attributes. | Rafael Mendonça França | 2012-12-09 | 1 | -0/+9 |
| | | | | | | | | This is a test for 978c568a7bffe354180aaefa471092182fed1015 | ||||
* | | Merge pull request #8472 from schneems/schneems/expand_path | Rafael Mendonça França | 2012-12-09 | 1 | -1/+1 |
|\ \ | | | | | | | Use `File.expand_path` instead of `File.join` | ||||
| * | | Use `File.expand_path` instead of `File.join` | schneems | 2012-12-09 | 1 | -1/+1 |
| | | | | | | | | | cc/ @carlosantoniodasilva | ||||
* | | | Revert "Omit directories from gemspec.files for RubyGems 2 compat." | Jeremy Kemper | 2012-12-09 | 7 | -7/+7 |
| | | | | | | | | | | | | | | | | | | Obviated by rubygems/rubygems@486ed83cc8e706069213c5d406122f4cfcca9e7f This reverts commit bb8923dee093b615615cdfb83b34d1b0bb254f25. | ||||
* | | | Move to the schema-migrations-metadata branch. | Jeremy Kemper | 2012-12-09 | 15 | -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 Dev | 2012-12-09 | 1 | -3/+1 |
| | | |||||
* | | Remove the spaces after the open bracket and before the close bracket. | Rafael Mendonça França | 2012-12-09 | 1 | -1/+1 |
| | | | | | | | | All our generated code follow this rule | ||||
* | | Merge pull request #8469 from kytrinyx/explicit-mysql-instructions | Rafael Mendonça França | 2012-12-09 | 1 | -0/+3 |
|\ \ | | | | | | | | | | | | | Include command to create mysql user [ci skip] | ||||
| * | | Include command to create mysql user | Katrina Owen | 2012-12-09 | 1 | -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 Dev | 2012-12-09 | 1 | -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-locations | Jeremy Kemper | 2012-12-08 | 1 | -1/+7 |
|\ \ \ | | | | | | | | | Make rake task for code statistics handle new test locations properly | ||||
| * | | | Make code statistics rake task handle new test locations properly | George Claghorn | 2012-12-09 | 1 | -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 Kemper | 2012-12-08 | 7 | -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 indentation | Carlos Antonio da Silva | 2012-12-08 | 1 | -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-1 | Jeremy Kemper | 2012-12-08 | 8 | -34/+144 |
|\ \ \ | | | | | | | | | Add `variables:` to database.yml for mysql, mysql2, and postgresql adapters | ||||
| * | | | Session variables for mysql, mysql2, and postgresql adapters can be set | Aaron Stone | 2012-12-08 | 8 | -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/master | Vijay Dev | 2012-12-08 | 4 | -5/+128 |
|\ \ \ \ | | | | | | | | | | | Kindle ebook generation with working section navigation | ||||
| * | | | | Add periodical-style TOC and navigation to Kindle version of guides | Daniel Choi | 2012-12-01 | 4 | -5/+128 |
| | | | | | |||||
* | | | | | update release notes [ci skip] | Vijay Dev | 2012-12-08 | 1 | -1/+41 |
| |/ / / |/| | | | |||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-12-08 | 32 | -172/+196 |
|\ \ \ \ | |||||
| * | | | | copy edits [ci skip] | Vijay Dev | 2012-12-08 | 2 | -4/+3 |
| | | | | | |||||
| * | | | | Revert "Introduce Bundler and Gemfiles in a NOTE" | Vijay Dev | 2012-12-08 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 83cb6fbd13f3c5ea3106b9a57964b1a6fb243682. Reason: very trivial [ci skip] | ||||
| * | | | | Fill out API Documentation Guidelines 'you will learn' list. | Steve Klabnik | 2012-12-07 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Fill out Active Support Core Extensions 'you will learn' list. | Steve Klabnik | 2012-12-07 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Remove reference to background queue in mailer guide. | Steve Klabnik | 2012-12-07 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Mailers are always async now, and we already discuss queueing lower down in the guide. | ||||
| * | | | | Remove references to Rails versions. | Steve Klabnik | 2012-12-07 | 13 | -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.rb | Claudio B. | 2012-12-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Fix a typo in rdoc (*expect* for *except*) | ||||
| * | | | | Punctuation, capitalization, grammar fixes in rails guides | Katie Oldaker | 2012-12-07 | 7 | -15/+19 |
| | | | | | |||||
| * | | | | Fix small grammatical error | Max Katz | 2012-12-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed grammar in a lot of guide prologues. | Katie Oldaker | 2012-12-07 | 22 | -88/+88 |
| | | | | | |||||
| * | | | | Added overview items to Guides Guidelines prologue | Ian C. Anderson | 2012-12-07 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | changing tense, since Rails 3.2 has been released | Drew Dara-Abrams | 2012-12-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | API reader should look elsewhere for helper instructions | Thiago Pinto | 2012-12-06 | 1 | -0/+24 |
| | | | | | |||||
| * | | | | complementary options guidelines for f.file_field and file_field_tag | Thiago Pinto | 2012-12-06 | 2 | -0/+8 |
| | | | | | |||||
| * | | | | adding example for f.file_input | Thiago Pinto | 2012-12-06 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | adding example for f.file_input | Thiago Pinto | 2012-12-06 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | correct bad jquery syntax | Thiago Pinto | 2012-12-06 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Introduce Bundler and Gemfiles in a NOTE | Pablo Torres | 2012-12-05 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Define a generator before referring to it | Pablo Torres | 2012-12-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Correct bad English | Pablo Torres | 2012-12-04 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #120 from tonytonyjan/patch | 簡煒航 | 2012-12-04 | 1 | -1/+18 |
| |\ \ \ \ | | | | | | | | | | | | | add a notice about loading assets in production mode | ||||
| | * | | | | add a notice about loading assets in production mode | Tony Jian | 2012-12-05 | 1 | -1/+18 |
| |/ / / / |