Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Backpedal from class-oriented config.queue. Set an actual queue instance. | Jeremy Kemper | 2012-10-12 | 2 | -2/+2 |
| | |||||
* | Immediately run queued jobs in tests. Otherwise you have to explicitly drain ↵ | Jeremy Kemper | 2012-10-12 | 1 | -2/+2 |
| | | | | the queue to actually deliver your emails. | ||||
* | Fixing build failures | Vijay Dev | 2012-10-11 | 6 | -14/+14 |
| | | | | | | | Build failed with an error "invalid multibyte char (US-ASCII)" in these files. Apparently, some UTF-8 char disguised as whitespace causes this. Thanks @rafaelfranca | ||||
* | Merge pull request #7898 from olivierlacan/pg_homebrew_instructions | Vijay Dev | 2012-10-10 | 1 | -1/+3 |
|\ | | | | | Offer instructions for pg gem when installed via Homebrew | ||||
| * | Offer instructions for pg gem when installed via Homebrew | Olivier Lacan | 2012-10-10 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-11 | 39 | -93/+86 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb | ||||
| * | | copy-edit the email delivery errors comment | Vijay Dev | 2012-10-11 | 1 | -1/+1 |
| | | | |||||
| * | | update Rails::Generators docs [ci skip] | Francesco Rodriguez | 2012-10-07 | 21 | -42/+34 |
| | | | |||||
| * | | nodoc JS::Generators [ci skip] | Francesco Rodriguez | 2012-10-07 | 1 | -3/+3 |
| | | | |||||
| * | | nodoc Erb::Generators [ci skip] | Francesco Rodriguez | 2012-10-07 | 4 | -11/+11 |
| | | | |||||
| * | | nodoc CSS::Generators [ci skip] | Francesco Rodriguez | 2012-10-07 | 2 | -6/+6 |
| | | | |||||
| * | | nodoc TestUnit::Generators [ci skip] | Francesco Rodriguez | 2012-10-07 | 10 | -30/+30 |
| | | | |||||
| * | | Update ↵ | Adrien Lamothe | 2012-10-06 | 1 | -1/+2 |
| | | | | | | | | | | | | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt | ||||
* | | | fix github url [ci skip] | Vijay Dev | 2012-10-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2012-10-10 | 15 | -29/+30 |
|\ \ \ | | |/ | |/| | |||||
| * | | Update test locations | Mike Moore | 2012-10-09 | 12 | -20/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default test locations to avoid confusion around the common testing terms "unit" and "functional". Add new rake tasks for the new locations, while maintaining backwards compatibility with the old rake tasks. New testing locations are as follows: app/models -> test/models (was test/units) app/helpers -> test/helpers (was test/units/helpers) app/controllers -> test/controllers (was test/functional) app/mailers -> test/mailers (was test/functional) | ||||
| * | | Rails.config doesn't exist, it should be Rails.application.config instead | Guillermo Iguaran | 2012-10-09 | 1 | -3/+3 |
| | | | |||||
| * | | Remove duplicate 'the' article in commented line | claudiob | 2012-10-08 | 1 | -1/+1 |
| | | | | | | | | | | | | The sentence used to read "at the bottom of the the compiled file" | ||||
| * | | Merge pull request #7873 from steveklabnik/update_initializer | David Heinemeier Hansson | 2012-10-08 | 2 | -8/+7 |
| |\ \ | | | | | | | | | Moving locale stuff from app.rb to an initializer. | ||||
| | * | | Moving locale stuff from app.rb to an initializer. | Steve Klabnik | 2012-10-08 | 2 | -8/+7 |
| | | | | |||||
* | | | | There is already an invitation to use rack-cache in ↵ | David Heinemeier Hansson | 2012-10-08 | 1 | -3/+0 |
|/ / / | | | | | | | | | | config/environments/production.rb | ||||
* | | | Cleanup comments a bit and fuck 80 characters | David Heinemeier Hansson | 2012-10-08 | 1 | -16/+10 |
| | | | |||||
* | | | Inline comment | David Heinemeier Hansson | 2012-10-08 | 1 | -3/+1 |
|/ / | |||||
* | | Encoding already defaults to utf-8 per lib/rails/application/configuration.rb:23 | David Heinemeier Hansson | 2012-10-08 | 1 | -3/+0 |
| | | |||||
* | | Everyone is running bundler, no need for defensive programming shit | David Heinemeier Hansson | 2012-10-08 | 1 | -2/+2 |
| | | |||||
* | | Not precompiling your assets for production is a bad idea -- do not encourage it | David Heinemeier Hansson | 2012-10-08 | 1 | -6/+2 |
| | | |||||
* | | Revert "Use flat_map { } instead of map {}.flatten" | Santiago Pastorino | 2012-10-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | This reverts commit abf8de85519141496a6773310964ec03f6106f3f. We should take a deeper look to those cases flat_map doesn't do deep flattening. irb(main):002:0> [[[1,3], [1,2]]].map{|i| i}.flatten => [1, 3, 1, 2] irb(main):003:0> [[[1,3], [1,2]]].flat_map{|i| i} => [[1, 3], [1, 2]] | ||||
* | | Use flat_map { } instead of map {}.flatten | Santiago Pastorino | 2012-10-05 | 1 | -1/+1 |
| | | |||||
* | | Comment rack-cache entry on Gemfile | Guillermo Iguaran | 2012-10-04 | 1 | -1/+1 |
| | | |||||
* | | config.action_dispatch.rack_cache should set explicitly to enable Rack::Cache | Guillermo Iguaran | 2012-10-04 | 1 | -0/+5 |
| | | |||||
* | | Strip heredoc to not generate the Gemfile with trailing spaces | Rafael Mendonça França | 2012-10-04 | 1 | -2/+2 |
| | | |||||
* | | Turn turbolinks on by default for new apps | David Heinemeier Hansson | 2012-10-04 | 3 | -4/+11 |
| | | |||||
* | | Merge pull request #7794 from guilleiguaran/extract-rack-cache | Santiago Pastorino | 2012-10-01 | 1 | -0/+4 |
|\ \ | | | | | | | Use Rack::Cache middleware only if is in Gemfile | ||||
| * | | Add rack-cache to default Gemfile | Guillermo Iguaran | 2012-10-01 | 1 | -0/+4 |
| |/ | |||||
* / | Fixed generated whitespace in routes when using namespaced resource. | Jeremy Walker | 2012-09-29 | 1 | -4/+41 |
|/ | |||||
* | Remove of an extra line in template configuration file. | Geoffrey Roguelon | 2012-09-24 | 1 | -1/+0 |
| | |||||
* | Removed sorting of attribute names in controller generator. | Brian Morearty | 2012-09-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | I believe when people use generators, they typically order the parameters on the command line in an order that makes sense to them. Sorting them in the generated code makes the order seem more arbitrary to humans, even though it's less arbitrary to computers. :-) Example: rails g scaffold Post title:string content:text The human chose to put title before content. Sorted attributes in the generated code work but don't match the human's intent: params.require(:posts).permit(:content, :title) | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-21 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/configurable.rb activesupport/lib/active_support/core_ext/module/deprecation.rb guides/source/action_controller_overview.md guides/source/active_support_core_extensions.md guides/source/ajax_on_rails.textile guides/source/association_basics.textile guides/source/upgrading_ruby_on_rails.md While resolving conflicts, I have chosen to ignore changes done in docrails at some places - these will be most likely 1.9 hash syntax changes. | ||||
| * | Remove redundant 'the'. | Uģis Ozols | 2012-09-13 | 1 | -1/+1 |
| | | |||||
* | | Change scaffold_generator: Don't use #require or #permit in scaffold if ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -0/+4 |
| | | | | | | | | attributes list isn't given | ||||
* | | Change scaffold_controller to generate and use private method to encapsulate ↵ | Guillermo Iguaran | 2012-09-16 | 2 | -2/+12 |
| | | | | | | | | permissible params | ||||
* | | Remove all references to attr_accessible/protected and old ↵ | Guillermo Iguaran | 2012-09-16 | 3 | -13/+0 |
| | | | | | | | | mass_assignment_sanitizers | ||||
* | | Move queue classes to ActiveSupport | Santiago Pastorino | 2012-09-14 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #7616 from lest/null-session-forgery-protection | Michael Koziarski | 2012-09-13 | 1 | -1/+1 |
|\ \ | | | | | | | Implement :null_session CSRF protection method | ||||
| * | | Implement :null_session CSRF protection method | Sergey Nartimov | 2012-09-13 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | | | It's further work on CSRF after 245941101b1ea00a9b1af613c20b0ee994a43946. The :null_session CSRF protection method provide an empty session during request processing but doesn't reset it completely (as :reset_session does). | ||||
* | | change app/plugin generators to be more SCM agnostic | Derek Prior | 2012-09-12 | 3 | -61/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users of other SCM's can now generate rails apps that will add the "empty" directories to source control, but will not have a useless .gitignore or mis-named .gitkeep files. * Change `rails new` and `rails plugin new` generators to name the `.gitkeep` as `.keep` in a more SCM-agnostic way. * Change `--skip-git` option to only skip the `.gitignore` file and still generate the `.keep` files. * Add `--skip-keeps` option to skip the `.keep` files. It closes #2800. | ||||
* | | Remove the queue configuration from the environments templates since the | Rafael Mendonça França | 2012-09-12 | 2 | -4/+1 |
| | | | | | | | | default is the SynchronousQueue. | ||||
* | | Use the SynchronousQueue as default in production and development. | Rafael Mendonça França | 2012-09-12 | 2 | -4/+4 |
| | | | | | | | | | | We should not let the users use the ThreadedConsumer without know about the risks | ||||
* | | Action Mailer async flag is true by default using a Synchronous impl | Santiago Pastorino | 2012-09-11 | 1 | -3/+0 |
|/ | |||||
* | require bundle in the app generator | Xavier Noria | 2012-09-01 | 1 | -0/+1 |
| | | | | | | | The app generator is not generally run under bundler, but the Bundler constant is used here. In particular you cannot create --dev apps without this. |