aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Moving code base to 1.9 hash syntaxAvnerCohen2012-10-163-7/+7
|
* Hash syntax to 1.9 styleAvnerCohen2012-10-151-2/+2
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-1140-94/+87
|\ | | | | | | | | | | Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
| * copy-edit the email delivery errors commentVijay Dev2012-10-111-1/+1
| |
| * update Rails::Generators docs [ci skip]Francesco Rodriguez2012-10-0722-43/+35
| |
| * nodoc JS::Generators [ci skip]Francesco Rodriguez2012-10-071-3/+3
| |
| * nodoc Erb::Generators [ci skip]Francesco Rodriguez2012-10-074-11/+11
| |
| * nodoc CSS::Generators [ci skip]Francesco Rodriguez2012-10-072-6/+6
| |
| * nodoc TestUnit::Generators [ci skip]Francesco Rodriguez2012-10-0710-30/+30
| |
| * Update ↵Adrien Lamothe2012-10-061-1/+2
| | | | | | | | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
* | fix github url [ci skip]Vijay Dev2012-10-111-1/+1
| |
* | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2012-10-1017-37/+66
|\ \
| * | Update test locationsMike Moore2012-10-0914-28/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 insteadGuillermo Iguaran2012-10-091-3/+3
| | |
| * | Remove duplicate 'the' article in commented lineclaudiob2012-10-081-1/+1
| | | | | | | | | | | | The sentence used to read "at the bottom of the the compiled file"
| * | Merge pull request #7873 from steveklabnik/update_initializerDavid Heinemeier Hansson2012-10-082-8/+7
| |\ \ | | | | | | | | Moving locale stuff from app.rb to an initializer.
| | * | Moving locale stuff from app.rb to an initializer.Steve Klabnik2012-10-082-8/+7
| | | |
* | | | There is already an invitation to use rack-cache in ↵David Heinemeier Hansson2012-10-081-3/+0
|/ / / | | | | | | | | | config/environments/production.rb
* | | Cleanup comments a bit and fuck 80 charactersDavid Heinemeier Hansson2012-10-081-16/+10
| | |
* | | Inline commentDavid Heinemeier Hansson2012-10-081-3/+1
|/ /
* | Encoding already defaults to utf-8 per lib/rails/application/configuration.rb:23David Heinemeier Hansson2012-10-081-3/+0
| |
* | Everyone is running bundler, no need for defensive programming shitDavid Heinemeier Hansson2012-10-081-2/+2
| |
* | Not precompiling your assets for production is a bad idea -- do not encourage itDavid Heinemeier Hansson2012-10-081-6/+2
| |
* | Rename "Fixtures" class to "FixtureSet"Alexey Muranov2012-10-071-2/+2
| | | | | | | | Rename `ActiveRecord::Fixtures` class to `ActiveRecord::FixtureSet`. Instances of this class normally hold a collection of fixtures (records) loaded either from a single YAML file, or from a file and a folder with the same name. This change make the class name singular and makes the class easier to distinguish from the modules like `ActiveRecord::TestFixtures`, which operates on multiple fixture sets, or `DelegatingFixtures`, `::Fixtures`, etc., and from the class `ActiveRecord::Fixture`, which corresponds to a single fixture.
* | Gotta log each spacer line separately to ensure each is taggedJeremy Kemper2012-10-061-1/+4
| |
* | Tag the blank log line between dev requests so it's easier to filter out ↵Jeremy Kemper2012-10-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | entire requests with grep -v without leaving a stray newline behind. Example: # Tag asset requests so it's easy to filter them from dev logs config.log_tags = [ -> request { :assets if request.path.starts_with?(config.assets.prefix) }, -> request { request.uuid } ] # Watch the logs, ignoring asset requests $ tail -100f log/development.log | grep -v assets
* | Remove unneeded attr_readerRafael Mendonça França2012-10-071-1/+0
| |
* | use Rails backtrace in testsFrancesco Rodriguez2012-10-051-0/+4
| |
* | Revert "Use flat_map { } instead of map {}.flatten"Santiago Pastorino2012-10-054-5/+5
| | | | | | | | | | | | | | | | | | | | | | 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 {}.flattenSantiago Pastorino2012-10-054-5/+5
| |
* | Comment rack-cache entry on GemfileGuillermo Iguaran2012-10-041-1/+1
| |
* | config.action_dispatch.rack_cache should set explicitly to enable Rack::CacheGuillermo Iguaran2012-10-042-0/+14
| |
* | Strip heredoc to not generate the Gemfile with trailing spacesRafael Mendonça França2012-10-041-2/+2
| |
* | Turn turbolinks on by default for new appsDavid Heinemeier Hansson2012-10-043-4/+11
| |
* | Merge pull request #6952 from NZKoz/key_generatorMichael Koziarski2012-10-021-1/+10
|\ \ | | | | | | Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2
| * | Provide access to the application's KeyGeneratorMichael Koziarski2012-10-011-1/+10
| | | | | | | | | | | | Available both as an env entry for rack and an instance method on Rails::Application for other uses
* | | Merge pull request #7794 from guilleiguaran/extract-rack-cacheSantiago Pastorino2012-10-012-0/+10
|\ \ \ | | | | | | | | Use Rack::Cache middleware only if is in Gemfile
| * | | Add rack-cache to default GemfileGuillermo Iguaran2012-10-011-0/+4
| | | |
| * | | Use Rack::Cache middleware only if is in GemfileGuillermo Iguaran2012-10-011-0/+6
| |/ /
* / / Fixed generated whitespace in routes when using namespaced resource.Jeremy Walker2012-09-291-4/+41
|/ /
* / Assets cache shouldn't be shared between different environmentsGuillermo Iguaran2012-09-282-2/+4
|/
* Tune up Rails::Rack::Logger. Only put space between requests in development ↵Jeremy Kemper2012-09-261-14/+23
| | | | logs.
* Log newlines separately to ensure the 'Started GET ...' line has a tag on ↵Jeremy Kemper2012-09-251-1/+2
| | | | the same line
* Only apply log tags if the logger supports itJeremy Kemper2012-09-241-1/+1
|
* Remove of an extra line in template configuration file.Geoffrey Roguelon2012-09-241-1/+0
|
* Removed sorting of attribute names in controller generator.Brian Morearty2012-09-231-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/docrailsVijay Dev2012-09-212-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Updated description of what engines are used forStephan Hagemann2012-09-211-2/+2
| |
| * Remove redundant 'the'.Uģis Ozols2012-09-131-1/+1
| |
* | Remove highly uncommon `config.assets.manifest` option for moving the ↵Guillermo Iguaran2012-09-191-1/+0
| | | | | | | | | | | | manifest path. This option is now unsupported in sprockets-rails.