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 | 1 | -1/+1 |
| |/ |/| | | | | | | | | | Obviated by rubygems/rubygems@486ed83cc8e706069213c5d406122f4cfcca9e7f This reverts commit bb8923dee093b615615cdfb83b34d1b0bb254f25. | ||||
* | | 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 | ||||
* | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | 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. | ||||
* | | Fix scaffold controller generator tests | Carlos Antonio da Silva | 2012-12-08 | 1 | -8/+6 |
| | | |||||
* | | 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 #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 |
| | | | | |||||
* | | | | 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. | ||||
* | | | Let the scaffold example use the "set shared record" pattern to explain ↵ | David Heinemeier Hansson | 2012-12-07 | 1 | -6/+7 |
| | | | | | | | | | | | | callbacks | ||||
* | | | Revert "Invert precedence of content in ActionDispatch::Static" | Andrew White | 2012-12-07 | 1 | -23/+0 |
| | | | | | | | | | | | | This reverts commit c59734f756b79c39486c45273d2cc5d42cd0c864. | ||||
* | | | Stop shelling out more than necessary | Carlos Antonio da Silva | 2012-12-07 | 1 | -10/+10 |
| | | | |||||
* | | | Run rake tasks all at once in rake dbs test for a speed up | Carlos Antonio da Silva | 2012-12-06 | 1 | -12/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: Finished tests in 56.245787s, 0.2133 tests/s, 0.0000 assertions/s. 12 tests, 0 assertions, 0 failures, 0 errors, 0 skips After: Finished tests in 42.401416s, 0.2830 tests/s, 0.0000 assertions/s. 12 tests, 0 assertions, 0 failures, 0 errors, 0 skips | ||||
* | | | Invert precedence of content in ActionDispatch::Static | Andrew White | 2012-12-06 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit inverts the precedence in ActionDispatch::Static so that dynamic content will be served before static content. This is so that precompiled assets do not inadvertently get included when running in development mode - it should have no effect in production where static files are usually handled by the web server. Closes #6421 | ||||
* | | | Refactor tests that switch RAILS_ENV and RACK_ENV | Carlos Antonio da Silva | 2012-12-06 | 6 | -63/+63 |
| |/ |/| | | | | | | | | | | | | | | | | | | | | | This cleanup aims to fix a build failure: https://travis-ci.org/rails/rails/jobs/3515951/#L482 Since travis always have both ENV vars set to "test", a test is failing where it's expected to output the default env "development", but "test" is the result due to RACK_ENV being set when we expect it to not be. By cleaning this duplication we ensure that changing any of these env variables will pick the right expected value. | ||||
* | | Revert turbolinks load order requirement | Nick Reed | 2012-12-05 | 1 | -3/+1 |
| | | |||||
* | | Fix duplicated method name | Carlos Antonio da Silva | 2012-12-05 | 1 | -2/+1 |
| | | | | | | | | [ci skip] | ||||
* | | Add ENV['RACK_ENV'] support to rake runner/console/server. | kennyj | 2012-12-06 | 7 | -5/+67 |
| | | |||||
* | | Merge pull request #8404 from freegenie/filter_redirects | Andrew White | 2012-12-05 | 2 | -1/+4 |
|\ \ | |||||
| * | | Adding filter capability to ActionController logs | Fabrizio Regini | 2012-12-05 | 2 | -1/+4 |
| | | | |||||
* | | | Replace comments' non-breaking spaces with spaces | claudiob | 2012-12-04 | 2 | -2/+2 |
|/ / | | | | | | | | | | | | | | | | | | | Sometimes, on Mac OS X, programmers accidentally press Option+Space rather than just Space and don’t see the difference. The problem is that Option+Space writes a non-breaking space (0XA0) rather than a normal space (0x20). This commit removes all the non-breaking spaces inadvertently introduced in the comments of the code. | ||||
* | | Track the default application.css/js files for turbolinks as per version 0.6.0 | David Heinemeier Hansson | 2012-12-04 | 1 | -2/+2 |
| | | |||||
* | | Locate `=require turbolinks` at the bottom of application.js | Yasuharu Ozaki | 2012-12-04 | 1 | -1/+3 |
| | | | | | | | | | | Turbolinks should be located at the bottom of application.js to detect assets change properly. | ||||
* | | Fix wrong doc and message about rails profiler. | kennyj | 2012-12-04 | 1 | -1/+1 |
| | | |||||
* | | Fix failing tests related to rake notes | Carlos Antonio da Silva | 2012-12-03 | 1 | -2/+2 |
| | | | | | | | | Related to changes introduced in 553b563749517114323b4e8742509227e0daab67 | ||||
* | | Merge pull request #8394 from acangiano/add_db_folder_to_annotations | Rafael Mendonça França | 2012-12-01 | 3 | -1/+7 |
|\ \ | | | | | | | Add db to the list of default annotation folders | ||||
| * | | Add db to the list of default annotation folders | Antonio Cangiano | 2012-12-01 | 3 | -1/+7 |
| |/ | |||||
* / | Quote ~ in git config global excludes command. | Matthew M. Boedicker | 2012-12-01 | 1 | -1/+1 |
|/ | | | | | This will put ~/ in .gitconfig so it will not be hardcoded to the home directory where the command was run. | ||||
* | Gemfile source url for plugins updated | Amparo Luna | 2012-11-29 | 1 | -1/+1 |
| | |||||
* | Remove observers and sweepers | Rafael Mendonça França | 2012-11-28 | 13 | -155/+4 |
| | | | | | | | | They was extracted from a plugin. See https://github.com/rails/rails-observers [Rafael Mendonça França + Steve Klabnik] | ||||
* | Revert "Merge pull request #8341 from amatsuda/bundle_source_rubygems" | Rafael Mendonça França | 2012-11-27 | 2 | -2/+2 |
| | | | | | | | | | This reverts commit 33b29e0112db62d3a8c798bb58f51c0a839d9e26, reversing changes made to ac8c729342e6b020a57d0d6887c8a8d5b39f96e0. Reason: https://github.com/rails/rails/pull/4684#commitcomment-920313 | ||||
* | default source in Gemfiles to :rubygems rather than hardcoding the URL | Akira Matsuda | 2012-11-28 | 2 | -2/+2 |
| | | | | | | * I guess this would be the preferrable default for Bundler * current version of Bundler converts :rubygems into 'http://rubygems.org', not https://, and that will help those who are working on a very poor network environment that doesn't allow SSL | ||||
* | Unused variable warning removed | Rashmi Yadav | 2012-11-27 | 1 | -1/+0 |
| | |||||
* | Refactor generators tests to include test helpers in the parent class | Carlos Antonio da Silva | 2012-11-27 | 1 | -4/+3 |
| | |||||
* | Initialize accessors to remove some warnings in Ruby 2.0 | Arun Agrawal | 2012-11-21 | 1 | -0/+2 |
| | |||||
* | Better Error handling when parsing database.yaml | Gaurish Sharma | 2012-11-20 | 1 | -0/+4 |
| | | | | | Provides a better error message incase the database.yaml has some errors. |