Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-02-18 | 1 | -2/+2 |
|\ | |||||
| * | update engines guide to explicitly reference relative-to-engine-root-path ↵ | Ryan Bigg | 2012-02-16 | 1 | -1/+1 |
| | | | | | | | | for db/seeds.rb | ||||
| * | Rails::Engine docs should use helper method, not helpers | Ryan Bigg | 2012-02-16 | 1 | -1/+1 |
| | | |||||
* | | Refactor Rails::Console to make it easier to test and add tests for it | Piotr Sarnacki | 2012-02-16 | 1 | -25/+46 |
| | | |||||
* | | Allow to set custom console type with Rails.application.config.console= | Piotr Sarnacki | 2012-02-16 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds ability to set custom console if you want to use something other than IRB. Previously the hack that people used was: silence_warnings do require 'pry' IRB = Pry end which is not the best way to customize things. | ||||
* | | Remove console --irb deprecation notice | Piotr Sarnacki | 2012-02-16 | 1 | -1/+0 |
| | | |||||
* | | remove unnecessary require core_ext/string/encoding | Sergey Nartimov | 2012-02-14 | 1 | -1/+0 |
|/ | |||||
* | always flush all logs. fixes #4277 | Aaron Patterson | 2012-02-07 | 1 | -1/+1 |
| | |||||
* | Fix that failed tests should exit with a nonzero error code. | Jeremy Kemper | 2012-02-07 | 2 | -31/+17 |
| | | | | | | Partially reverts 14c89e7285d4e7cd40a542fbc31d9345f60c3aa4. Hat tip to @tenderlove for paring down the TestTask! | ||||
* | Display annotations from .coffee files in `rake notes` | Bartlomiej Kozal | 2012-02-05 | 1 | -2/+2 |
| | |||||
* | Add convenience method to hide a generator from the available ones | Carlos Antonio da Silva | 2012-02-03 | 1 | -0/+6 |
| | | | | | | It is usually useful to be able to hide a generator when running rails generate command. Such generators might be used only to dry up generators code and shouldn't be available to end users. | ||||
* | Use https://rubygems.org source for default Gemfile | Guillermo Iguaran | 2012-02-01 | 1 | -1/+1 |
| | | | | See https://github.com/rails/rails/pull/4684#commitcomment-920313 | ||||
* | Merge pull request #4825 from sikachu/master-fix-plugin-new | José Valim | 2012-02-01 | 1 | -1/+1 |
|\ | | | | | Fix broken test introduced from #4814 | ||||
| * | Fix broken test introduced from #4814 | Prem Sichanugrist | 2012-02-01 | 1 | -1/+1 |
| | | | | | | | | | | | | * ruby_debugger_gemfile_entry was removed from the generator. Please make sure to run `grep` or `ack` to make sure it was removed in every places. | ||||
* | | Fix GH #4737. Missing helper file (LoadError) in mountable plugin. | kennyj | 2012-02-02 | 1 | -1/+3 |
|/ | |||||
* | Remove ruby_debugger_gemfile_entry from app_base, we can just put ↵ | Guillermo Iguaran | 2012-02-01 | 2 | -5/+1 |
| | | | | ruby-debug19 commented directly in Gemfile | ||||
* | Don't run bundle install when passed with --pretend option | kennyj | 2012-02-01 | 1 | -1/+1 |
| | |||||
* | Only add ActiveRecord configuration if it is present | Rafael Mendonça França | 2012-01-31 | 1 | -1/+1 |
| | |||||
* | Merge pull request #4727 from railsaholic/dependent_restrict_should_add_error | Jon Leighton | 2012-01-31 | 1 | -0/+5 |
|\ | | | | | has_many/has_one, :dependent => :restrict, deprecation added | ||||
| * | has_many/has_one, :dependent => :restrict, deprecation added. | Manoj | 2012-01-29 | 1 | -0/+5 |
| | | |||||
* | | Fix failing test from [7619bcf2] | Prem Sichanugrist | 2012-01-30 | 1 | -1/+1 |
| | | |||||
* | | rewrites a couple of alternations in regexps as character classes | Xavier Noria | 2012-01-30 | 1 | -1/+1 |
| | | | | | | | | | | Character classes are the specific regexp construct to express alternation of individual characters. | ||||
* | | Fixes #4764 - remove generated new line in routes.rb on scaffold generation | Vijay Dev | 2012-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | As explained in #4764, when destroying a scaffold, routes.rb loses a new line. This seems to happen because a new line is added while generating the route and the destroy generator removes it. However, this causes a problem if the routes file is manually edited to remove such new lines. This commit just removes that extra new line from added in the first place. | ||||
* | | Used block to make sure file get auto closed after use | Rahul P. Chaudhari | 2012-01-30 | 1 | -14/+16 |
| | | |||||
* | | remove ruby 1.8 support code | Sergey Nartimov | 2012-01-29 | 1 | -6/+2 |
| | | |||||
* | | Replaced all 'for' loops with Enumerable#each | Nathan Broadbent | 2012-01-30 | 1 | -1/+1 |
|/ | |||||
* | Reverted build_original_fullpath method, as per discussion at ↵ | Nathan Broadbent | 2012-01-28 | 1 | -1/+9 |
| | | | | https://github.com/rails/rails/pull/4470/files#r393461 | ||||
* | Remove redundant instance_variables (@colorize_logging) | kennyj | 2012-01-27 | 1 | -2/+1 |
| | |||||
* | Revert "Merge pull request #4690 from jdutil/filter_password_confirmation" | José Valim | 2012-01-26 | 1 | -1/+1 |
| | | | | | This reverts commit eafa1c429835e099897a0da90bc39d9dbbb7ed4e, reversing changes made to f251437415f7b803f7a84118fcc970a111ace266. | ||||
* | Add :password_confirmation as a filtered param by default. | Jeff Dutil | 2012-01-26 | 1 | -1/+1 |
| | |||||
* | Merge pull request #4684 from rossmeissl/patch-1 | Xavier Noria | 2012-01-25 | 1 | -1/+1 |
|\ | | | | | Use `:rubygems` shortcut as standard Gemfile's `source` instead of explicit URL | ||||
| * | Use `:rubygems` shortcut as standard Gemfile's `source` instead of explicit ↵ | Andy Rossmeissl | 2012-01-25 | 1 | -1/+1 |
| | | | | | | | | | | | | URL. Theoretically this would future-proof Gemfiles against possible (albeit unlikely) change in the rubygems URL. | ||||
* | | Use content_tag_for with array by default on scaffold. | José Valim | 2012-01-26 | 1 | -4/+2 |
|/ | |||||
* | use rack 1.4.1 | Sergey Nartimov | 2012-01-23 | 1 | -2/+0 |
| | |||||
* | Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fine with ↵ | José Valim | 2012-01-22 | 1 | -2/+2 |
| | | | | | | | | bash, zsh, etc, closes #4602 Conflicts: railties/test/generators/migration_generator_test.rb | ||||
* | Merge pull request #4592 from jviney/master | José Valim | 2012-01-21 | 1 | -2/+1 |
|\ | | | | | Fix setting $rails_rake_task variable. | ||||
| * | Fix `$rails_rake_task` global variable warning without replacing the value ↵ | Jonathan Viney | 2012-01-22 | 1 | -2/+1 |
| | | | | | | | | | | of $rails_rake_task if it is already set. Fixes #4591. | ||||
* | | uniformizes the punctuation of comments in some files generated for new apps | Xavier Noria | 2012-01-22 | 4 | -42/+42 |
|/ | | | | | | Some end with a full stop, some don't. Let's have attention to detail and make them uniform. I have chosen to add full stops according to our documentation guidelines related to RDoc. | ||||
* | broadcasting to the console and remove file tailing middleware | Aaron Patterson | 2012-01-20 | 1 | -1/+7 |
| | |||||
* | Merge pull request #4528 from j-manu/log-tailer-fix | Aaron Patterson | 2012-01-20 | 1 | -3/+7 |
|\ | | | | | Fix for log tailer when the log file doesn't exist. | ||||
| * | Fix for log tailer when the log file doesn't exist. | Manu J | 2012-01-20 | 1 | -3/+7 |
| | | |||||
* | | Merge pull request #4545 from trotter/fix-documentation-bug | Vijay Dev | 2012-01-20 | 1 | -1/+1 |
|\ \ | | | | | | | Fix documentation bug in Rails::Engine | ||||
| * | | Fix documentation bug in Rails::Engine | Trotter Cashion | 2012-01-19 | 1 | -1/+1 |
| | | | |||||
* | | | do not do reverse lookups on incoming requests for webrick. fixes #4542 | Aaron Patterson | 2012-01-19 | 1 | -0/+1 |
|/ / | |||||
* / | refactor RAILS_CACHE deprecation | Sergey Nartimov | 2012-01-19 | 1 | -29/+8 |
|/ | | | | that was introduced in 6f8159c4217dc8433a2027ced0c61e7ce94551d3 | ||||
* | Silent Sprockets logger when config.assets.logger is set to false | Guillermo Iguaran | 2012-01-17 | 1 | -0/+1 |
| | |||||
* | Deprecate RAILS_CACHE constant. | kennyj | 2012-01-18 | 3 | -5/+49 |
| | |||||
* | Merge pull request #4480 from lest/use-rack-body-proxy | José Valim | 2012-01-16 | 1 | -0/+2 |
|\ | | | | | Use Rack::BodyProxy | ||||
| * | use rack from master branch | Sergey Nartimov | 2012-01-16 | 1 | -0/+2 |
| | | | | | | | | | | it's needed until new rack release with Rack::BodyProxy fixes https://github.com/rack/rack/commit/b06ef82876416fe69429f7d3ee6e51bf26aec75f | ||||
* | | show stats for app/mailers | Akira Matsuda | 2012-01-16 | 1 | -0/+1 |
|/ |