aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Composition > inheritance.José Valim2011-12-121-3/+11
|
* Remove duplicate html_escape docsJeremy Kemper2011-12-111-10/+1
|
* Use 1.9 native XML escaping to speed up html_escape and shush regexp warningsJeremy Kemper2011-12-111-15/+36
| | | | | | | | | | | | length user system total real before 6 0.010000 0.000000 0.010000 ( 0.012378) after 6 0.010000 0.000000 0.010000 ( 0.012866) before 60 0.040000 0.000000 0.040000 ( 0.046273) after 60 0.040000 0.000000 0.040000 ( 0.036421) before 600 0.390000 0.000000 0.390000 ( 0.390670) after 600 0.210000 0.000000 0.210000 ( 0.209094) before 6000 3.750000 0.000000 3.750000 ( 3.751008) after 6000 1.860000 0.000000 1.860000 ( 1.857901)
* Added :use_two_digit_numbers option [Lennart Fridén & Kim Persson]Lennart Fridén2011-12-113-4/+27
| | | | | | | | | | Added use_two_digit_numbers select_tag option for displaying months and days with leading zeros without affecting the values (useful for e.g. ISO-style dates, 2011-08-01). Signed-off-by: José Valim <jose.valim@gmail.com> Conflicts: actionpack/CHANGELOG.md
* Merge pull request #3941 from azimux/fix_nested_under_indifferent_accessJosé Valim2011-12-112-0/+7
|\ | | | | Overrode Hash#nested_under_indifferent_access in HashWithIndifferentAccess
| * Overrode Hash#nested_under_indifferent_access in HashWithIndifferentAccessMiles Georgi2011-12-112-0/+7
|/ | | | to return self.
* update command line guide: generated README is now an rdocVijay Dev2011-12-111-3/+3
|
* Merge pull request #3936 from ↵Yehuda Katz2011-12-113-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 usedGuillermo Iguaran2011-12-113-0/+13
| |
* | revising docVijay Dev2011-12-111-3/+1
| |
* | Merge pull request #3933 from wfarr/masterJosé Valim2011-12-114-1/+52
|\ \ | |/ |/| Add button_tag support to ActionView::Helpers::FormBuilder
| * Add button_tag support to ActionView::Helpers::FormBuilder.Will Farrington2011-12-114-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-helpersJosé Valim2011-12-111-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 Iguaran2011-12-101-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 Patterson2011-12-101-0/+1
| | | | | | | | during setup
* | Errno::ENOENT error makes more sense when a file cannot be foundAaron Patterson2011-12-102-11/+1
| |
* | Try to keep people from calling the deprecated flush method.Aaron Patterson2011-12-101-0/+5
| |
* | Ensure that files that compile to js/css are not compiled by default with ↵Piotr Sarnacki2011-12-111-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 behaviorPiotr Sarnacki2011-12-111-2/+2
|/
* Fix AS test suite.José Valim2011-12-102-0/+2
|
* Merge pull request #3925 from guilleiguaran/extra-test-for-therubyrhinoYehuda Katz2011-12-091-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 usedGuillermo Iguaran2011-12-091-1/+5
| |
* | Merge pull request #3926 from ↵Yehuda Katz2011-12-092-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 givenGuillermo Iguaran2011-12-092-0/+6
|/
* revises some stuff that was out of sync with the recent generated README.rdocXavier Noria2011-12-102-1/+1
|
* Update partials documentation, partial_path is no longer generated using ↵Piotr Sarnacki2011-12-101-10/+13
| | | | RecordIdentifier
* * ActiveSupport::BufferedLogger#silence is deprecated. If you want to squelchAaron Patterson2011-12-096-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-extAaron Patterson2011-12-092-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 applicationSteve Richert2011-12-092-4/+4
|/
* Fix indentationPiotr Sarnacki2011-12-091-67/+67
|
* Allow to run migrations with given scope, with SCOPE=<scope>Piotr Sarnacki2011-12-093-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 blockPiotr Sarnacki2011-12-092-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é Valim2011-12-092-3/+1
|
* Use `table_exists?` from the schema cache.Aaron Patterson2011-12-094-8/+7
|
* don't need a begin / end.Aaron Patterson2011-12-091-6/+4
|
* squelch table exists? queries.Aaron Patterson2011-12-091-1/+1
|
* only load converter if the encodings are differentAaron Patterson2011-12-091-1/+1
|
* Make ActiveSupport::Benchmarkable a default module for ↵David Heinemeier Hansson2011-12-092-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 scopePiotr Sarnacki2011-12-092-48/+7
|
* Add suffix for migrations copied from enginesPiotr Sarnacki2011-12-093-34/+34
|
* String#to_a is not available in 1.9Piotr Sarnacki2011-12-092-2/+2
|
* Deprecate implicit layout lookup in favor of inheriting the _layout config.José Valim2011-12-093-34/+101
|
* Simplify path traversal logicJosé Valim2011-12-091-7/+7
|
* Run also migrations in subdirectories.Piotr Sarnacki2011-12-095-2/+45
| | | | | With this commit, ActiveRecord will also look for migrations in db/migrate subdirectories.
* Fix railties tests, identical migrations are not considered when copyingPiotr Sarnacki2011-12-091-0/+2
|
* Ignore origin comment when checking for duplicates on Migration.copyPiotr Sarnacki2011-12-093-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 enginesPiotr Sarnacki2011-12-092-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 Patterson2011-12-083-115/+1
| | | | encodings
* Exceptions should read from the spec configuAaron Patterson2011-12-081-1/+1
|
* Fix another regression related to the layout optimization.José Valim2011-12-082-1/+27
|