Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Overrode Hash#nested_under_indifferent_access in HashWithIndifferentAccess | Miles Georgi | 2011-12-11 | 2 | -0/+7 |
| | | | | to return self. | ||||
* | update command line guide: generated README is now an rdoc | Vijay Dev | 2011-12-11 | 1 | -3/+3 |
| | |||||
* | Merge pull request #3936 from ↵ | Yehuda Katz | 2011-12-11 | 3 | -0/+13 |
|\ | | | | | | | | | guilleiguaran/skip-assets-options-when-sprockets-skipped Skip assets options in environments files when --skip-sprockets is used | ||||
| * | Skip assets options in environments files when --skip-sprockets is used | Guillermo Iguaran | 2011-12-11 | 3 | -0/+13 |
| | | |||||
* | | revising doc | Vijay Dev | 2011-12-11 | 1 | -3/+1 |
| | | |||||
* | | Merge pull request #3933 from wfarr/master | José Valim | 2011-12-11 | 4 | -1/+52 |
|\ \ | |/ |/| | Add button_tag support to ActionView::Helpers::FormBuilder | ||||
| * | Add button_tag support to ActionView::Helpers::FormBuilder. | Will Farrington | 2011-12-11 | 4 | -1/+52 |
| | | | | | | | | | | | | | | | | | | | | This support is near-identical to the existing submit_tag support. Example: <%= form_for @post do |f| %> <%= f.button %> <% end %> | ||||
* | | Merge pull request #3932 from guilleiguaran/fix-assets-helpers | José Valim | 2011-12-11 | 1 | -3/+3 |
|\ \ | |/ |/| | Use ProcessedAsset#pathname in Sprockets helpers when debugging is on. Closes #3333 #3348 #3361. | ||||
| * | Use ProcessedAsset#pathname in Sprockets helpers when debugging is on. ↵ | Guillermo Iguaran | 2011-12-10 | 1 | -3/+3 |
| | | | | | | | | | | | | Closes #3333 #3348 #3361. Is wrong use ProcessedAsset#to_s since it returns the content of the file. | ||||
* | | ensure @fixture_connections is initialized in case an exception happens ↵ | Aaron Patterson | 2011-12-10 | 1 | -0/+1 |
| | | | | | | | | during setup | ||||
* | | Errno::ENOENT error makes more sense when a file cannot be found | Aaron Patterson | 2011-12-10 | 2 | -11/+1 |
| | | |||||
* | | Try to keep people from calling the deprecated flush method. | Aaron Patterson | 2011-12-10 | 1 | -0/+5 |
| | | |||||
* | | Ensure that files that compile to js/css are not compiled by default with ↵ | Piotr Sarnacki | 2011-12-11 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | `rake assets:precompile` This case was not tested and documentation was a bit confusing on that topic, so it was not obvious if current code works properly or not. | ||||
* | | Clarify the default assets.precompile matcher behavior | Piotr Sarnacki | 2011-12-11 | 1 | -2/+2 |
|/ | |||||
* | Fix AS test suite. | José Valim | 2011-12-10 | 2 | -0/+2 |
| | |||||
* | Merge pull request #3925 from guilleiguaran/extra-test-for-therubyrhino | Yehuda Katz | 2011-12-09 | 1 | -1/+5 |
|\ | | | | | Add test to verify that therubyrhino isn't included when JRuby isn't used | ||||
| * | Add test to verify that therubyrhino isn't included when JRuby isn't used | Guillermo Iguaran | 2011-12-09 | 1 | -1/+5 |
| | | |||||
* | | Merge pull request #3926 from ↵ | Yehuda Katz | 2011-12-09 | 2 | -0/+6 |
|\ \ | |/ |/| | | | | | guilleiguaran/skip-assets-group-if-sprockets-skipped Skip assets groups if --skip-sprockets option is given | ||||
| * | Skip assets groups if --skip-sprockets option is given | Guillermo Iguaran | 2011-12-09 | 2 | -0/+6 |
|/ | |||||
* | revises some stuff that was out of sync with the recent generated README.rdoc | Xavier Noria | 2011-12-10 | 2 | -1/+1 |
| | |||||
* | Update partials documentation, partial_path is no longer generated using ↵ | Piotr Sarnacki | 2011-12-10 | 1 | -10/+13 |
| | | | | RecordIdentifier | ||||
* | * ActiveSupport::BufferedLogger#silence is deprecated. If you want to squelch | Aaron Patterson | 2011-12-09 | 6 | -241/+96 |
| | | | | | | | | | | | | | | | | | | | | | | | logs for a certain block, change the log level for that block. * ActiveSupport::BufferedLogger#open_log is deprecated. This method should not have been public in the first place. * ActiveSupport::BufferedLogger's behavior of automatically creating the directory for your log file is deprecated. Please make sure to create the directory for your log file before instantiating. * ActiveSupport::BufferedLogger#auto_flushing is deprecated. Either set the sync level on the underlying file handle like this: f = File.open('foo.log', 'w') f.sync = true ActiveSupport::BufferedLogger.new f Or tune your filesystem. The FS cache is now what controls flushing. * ActiveSupport::BufferedLogger#flush is deprecated. Set sync on your filehandle, or tune your filesystem. | ||||
* | Merge pull request #3924 from laserlemon/readme-ext | Aaron Patterson | 2011-12-09 | 2 | -4/+4 |
|\ | | | | | Add the .rdoc extension to the README that Rails generates for a new app | ||||
| * | Add the .rdoc extension to the README that Rails generates for a new application | Steve Richert | 2011-12-09 | 2 | -4/+4 |
|/ | |||||
* | Fix indentation | Piotr Sarnacki | 2011-12-09 | 1 | -67/+67 |
| | |||||
* | Allow to run migrations with given scope, with SCOPE=<scope> | Piotr Sarnacki | 2011-12-09 | 3 | -1/+39 |
| | | | | | | | | | | | Scope in migrations can be defined by adding suffix in filename, like: 01_a_migration.blog.rb. Such migration have blog scope. Scope is automatically added while copying migrations from engine, so if you want to revert all of the migrations from given engine, you can just run db:migrate with SCOPE, like: rake db:migrate SCOPE=blog | ||||
* | Allow to filter migrations by passing a block | Piotr Sarnacki | 2011-12-09 | 2 | -9/+31 |
| | | | | | | | | | | Example: ActiveRecord::Migrator.migrate(path) do |migration| migration.name =~ /User/ end The above example will migrate only migrations with User in the name | ||||
* | Fix extend -> include. | José Valim | 2011-12-09 | 2 | -3/+1 |
| | |||||
* | Use `table_exists?` from the schema cache. | Aaron Patterson | 2011-12-09 | 4 | -8/+7 |
| | |||||
* | don't need a begin / end. | Aaron Patterson | 2011-12-09 | 1 | -6/+4 |
| | |||||
* | squelch table exists? queries. | Aaron Patterson | 2011-12-09 | 1 | -1/+1 |
| | |||||
* | only load converter if the encodings are different | Aaron Patterson | 2011-12-09 | 1 | -1/+1 |
| | |||||
* | Make ActiveSupport::Benchmarkable a default module for ↵ | David Heinemeier Hansson | 2011-12-09 | 2 | -0/+4 |
| | | | | ActionController::Base, so the #benchmark method is once again available in the controller context like it used to be *DHH* | ||||
* | Compare migrations for copying only by name and scope | Piotr Sarnacki | 2011-12-09 | 2 | -48/+7 |
| | |||||
* | Add suffix for migrations copied from engines | Piotr Sarnacki | 2011-12-09 | 3 | -34/+34 |
| | |||||
* | String#to_a is not available in 1.9 | Piotr Sarnacki | 2011-12-09 | 2 | -2/+2 |
| | |||||
* | Deprecate implicit layout lookup in favor of inheriting the _layout config. | José Valim | 2011-12-09 | 3 | -34/+101 |
| | |||||
* | Simplify path traversal logic | José Valim | 2011-12-09 | 1 | -7/+7 |
| | |||||
* | Run also migrations in subdirectories. | Piotr Sarnacki | 2011-12-09 | 5 | -2/+45 |
| | | | | | With this commit, ActiveRecord will also look for migrations in db/migrate subdirectories. | ||||
* | Fix railties tests, identical migrations are not considered when copying | Piotr Sarnacki | 2011-12-09 | 1 | -0/+2 |
| | |||||
* | Ignore origin comment when checking for duplicates on Migration.copy | Piotr Sarnacki | 2011-12-09 | 3 | -5/+58 |
| | | | | | | | 49ebe51 fixed copying migrations, but existing migrations would still trigger warnings. The proper way to compare migrations is to ignore origin lines - if migration is identical it means that we can silently skip it, regardless where it comes from. | ||||
* | Fix copying migrations from engines | Piotr Sarnacki | 2011-12-09 | 2 | -3/+24 |
| | | | | | | | | | | There was a bug in ActiveRecord::Migration.copy method, which prevented adding special comment about the origin of migration. Because of that, the check if migration is identical or if it's not and should be skipped was always saying that migration is skipped, which was causing additional useless warnings about skipped migrations. | ||||
* | load the encoding converter to work around [ruby-core:41556] when switching ↵ | Aaron Patterson | 2011-12-08 | 3 | -115/+1 |
| | | | | encodings | ||||
* | Exceptions should read from the spec configu | Aaron Patterson | 2011-12-08 | 1 | -1/+1 |
| | |||||
* | Fix another regression related to the layout optimization. | José Valim | 2011-12-08 | 2 | -1/+27 |
| | |||||
* | Move symbolize keys to the inner options as we can assume url_options will ↵ | José Valim | 2011-12-08 | 2 | -2/+2 |
| | | | | be properly symbolized. | ||||
* | Fix #3890. (Calling proxy_association in scope chain.) | Jon Leighton | 2011-12-08 | 3 | -3/+19 |
| | |||||
* | Fix a regression and also fix broken test. | José Valim | 2011-12-08 | 2 | -9/+14 |
| | |||||
* | fix nodocs | Vijay Dev | 2011-12-09 | 5 | -11/+11 |
| | |||||
* | add haml and slim to the list of extensions supported by rake notes | Vijay Dev | 2011-12-09 | 1 | -1/+1 |
| |