Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ / / | |||||
* | | | | Fix scaffold controller generator tests | Carlos Antonio da Silva | 2012-12-08 | 1 | -8/+6 |
| | | | | |||||
* | | | | Improve where.not docs [ci skip] | Carlos Antonio da Silva | 2012-12-08 | 1 | -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_generators | Carlos Antonio da Silva | 2012-12-08 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix #assert_instance_method to also assert indented methods | ||||
| * | | | | Fix #assert_instance_method to also assert indented methods | Francesco Rodriguez | 2012-12-08 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #8465 from frodsan/update_am_action_callbacks | Rafael Mendonça França | 2012-12-08 | 5 | -19/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | use _action callbacks in actionmailer | ||||
| * | | | | | use _action callbacks in actionmailer | Francesco Rodriguez | 2012-12-08 | 5 | -19/+19 |
|/ / / / / | |||||
* | | | | | Merge pull request #8395 from bmaland/attr_accessors | Carlos Antonio da Silva | 2012-12-08 | 1 | -23/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Use attr_accessor for Rails.{application,cache,logger} | ||||
| * | | | | | Use attr_accessor for Rails.{application,cache,logger} | Bjørn Arild Mæland | 2012-12-01 | 1 | -23/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #8457 from caike/master | Carlos Antonio da Silva | 2012-12-08 | 1 | -4/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Update AR Changelog with correct example using includes [ci skip] | ||||
| * | | | | | | Update AR Changelog with correct example using includes | Caike Souza | 2012-12-08 | 1 | -4/+4 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | These queries don't seem to work without the includes clause. [ci skip] | ||||
* | | | | | | Merge pull request #8462 from frodsan/update_guides_action_callbacks | Carlos Antonio da Silva | 2012-12-08 | 6 | -21/+21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update guides to use _action callbacks [ci skip] | ||||
| * | | | | | | update guides to use _action callbacks [ci skip] | Francesco Rodriguez | 2012-12-07 | 6 | -21/+21 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #8459 from frodsan/explicit! | Carlos Antonio da Silva | 2012-12-08 | 2 | -19/+14 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | use :only instead of :except callback option in the controller template | ||||
| * | | | | | fix scaffold controller generator tests | Francesco Rodriguez | 2012-12-07 | 1 | -16/+12 |
| | | | | | | |||||
| * | | | | | use :only instead of :except callback option in the controller template | Francesco Rodriguez | 2012-12-07 | 1 | -3/+2 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | As [Security Guide](http://edgeguides.rubyonrails.org/security.html#whitelists-versus-blacklists) says, it's better to use `before_filter only: []` instead of `except: []` so we don't forget to turn the filter off for newly added actions. |