aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11424 from kennyj/fix_column_defaults_cachingSantiago Pastorino2013-07-133-0/+15
|\ | | | | Reset @column_defaults when assigning locking_column.
| * Reset @column_defaults when assigning .kennyj2013-07-143-0/+15
| |
* | This is not needed anymore, before_initialize block can access configSantiago Pastorino2013-07-141-1/+0
| |
* | Merge pull request #11428 from evangoer/minor_asset_pipeline_docfixGuillermo Iguaran2013-07-131-2/+2
|\ \ | | | | | | Update YUI Compressor link; tweak UglifyJS
| * | [ci-skip] Update link, tweak UglifyJSEvan Goer2013-07-131-2/+2
|/ /
* | Merge pull request #11426 from wangjohn/action_controller_live_docsSantiago Pastorino2013-07-131-0/+86
|\ \ | | | | | | ActionController::Live documentation in the guides.
| * | ActionController::Live documentation in the guides.wangjohn2013-07-131-0/+86
| |/ | | | | | | | | I'm adding documentation to the action_controller_overview guide which should tell people how to stream arbitrary data.
* | Merge pull request #11427 from jmondo/patch-1Santiago Pastorino2013-07-131-1/+1
|\ \ | |/ |/| it's xml, not json
| * it's xml, not jsonJohn Gesimondo2013-07-131-1/+1
|/ | | change docs for xml serializer to talk about xml
* Merge pull request #11422 from arunagw/added_missing_actionviewGuillermo Iguaran2013-07-131-1/+1
|\ | | | | Added missing actionview in list for release
| * Added missing actionview in list for releaseArun Agrawal2013-07-131-1/+1
|/
* Merge pull request #11421 from arunagw/actionpack_activerecord_removeGuillermo Iguaran2013-07-131-91/+0
|\ | | | | Removed unused file! Moved to actionview
| * Removed unused file! Moved to actionviewArun Agrawal2013-07-131-91/+0
| | | | | | | | Removed unused file as this has been moved to actionview
* | Merge pull request #11413 from envylabs/masterYves Senn2013-07-131-2/+2
|\ \ | | | | | | Remove block argument from callback example. [ci skip]
| * | Remove block argument from callback example.Carlos Souza2013-07-131-2/+2
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #11420 from simi/remove_update_application_controller_taskYves Senn2013-07-132-12/+6
|\ \ \ | |_|/ |/| | Remove update:application_controller rake task.
| * | Remove update:application_controller rake task.Josef Šimánek2013-07-132-12/+6
|/ /
* | Merge pull request #11417 from arunagw/gem_source_index_no_requiredYves Senn2013-07-131-1/+0
|\ \ | | | | | | Removing Gem.source_index [ci skip]
| * | Removing Gem.source_index [ci skip]Arun Agrawal2013-07-131-1/+0
| |/
* | Merge pull request #11414 from ankit8898/typoYves Senn2013-07-131-1/+1
|\ \ | |/ |/| Typo fix [skip ci]
| * Typo fix [skip ci]Ankit Gupta2013-07-121-1/+1
|/
* add test-case to verify `error.path` when a helper was not found.Yves Senn2013-07-121-0/+5
| | | | | This verifies the code added with: https://github.com/rails/rails/commit/99c9d18601539c7e7e87f26bb047add1f93072af
* move `MissingHelperError` out of the `ClassMethods` module.Yves Senn2013-07-123-16/+23
|
* Merge pull request #11401 from dpdawson/masterYves Senn2013-07-121-2/+2
|\ | | | | Improved Active View Overview guide. [ci skip]
| * Improve Active View Overview guide. [ci skip]Daniel Dawson2013-07-121-2/+2
| |
* | Documment config.log_formatter added on 51aeae91Rafael Mendonça França2013-07-111-0/+2
|/ | | | [ci skip]
* Merge pull request #11400 from dpdawson/masterYves Senn2013-07-111-1/+1
|\ | | | | Fix a grammatical error/typo in Active Record Associations guide. [ci skip]
| * Fix a grammatical error/typo in Active Record Associations guide.Daniel Dawson2013-07-111-1/+1
|/
* Add missing requireAkira Matsuda2013-07-111-0/+1
|
* Only raise DelegationError if it's is the source of the exceptionAndrew White2013-07-113-10/+44
| | | | | | | | | This fixes situations where nested NoMethodError exceptions are masked by delegations. This would cause confusion especially where there was a problem in the Rails booting process because of a delegation in the routes reloading code. Fixes #10559
* Merge pull request #11389 from jetthoughts/11381_fix_hit_database_on_precompileJosé Valim2013-07-104-19/+26
|\ | | | | #11381: Ignore config.eager_load=true for rake
| * #11381: Ignore config.eager_load=true for rakePaul Nikitochkin2013-07-104-19/+26
| | | | | | | | Closes #11381
* | Merge pull request #11394 from robin850/patch-8Steve Klabnik2013-07-101-0/+17
|\ \ | | | | | | Add documentation for add_flash_types [ci skip]
| * | Add documentation for add_flash_types [ci skip]Robin Dupret2013-07-101-0/+17
| | | | | | | | | | | | | | | Document a little bit the ActionController::Flash::add_flash_types class method.
* | | Add missing require so that DateTime has the right superclassAndrew White2013-07-101-0/+1
|/ / | | | | | | | | | | | | | | If the DateTime core extensions were loaded before the Date core extensions then you would get a superclass mismatch as DateTime hasn't been defined yet so it gets set to Object by the acts_like core extension. Fixes #11206
* | Add failing test for #9562Andrew White2013-07-101-0/+5
| | | | | | | | | | | | | | | | Rails 4.0.0 fails when trying to encode an ActiveSupport::TimeWithZone that wraps a DateTime instance. This is fixed on master so add a test to prevent regression. (cherry picked from commit ad01b8da354268cebfae1519c28d19d75576ccb1)
* | Better not mutate the given options HashAkira Matsuda2013-07-101-3/+3
| |
* | Merge pull request #11391 from schuetzm/remove-swp-fileRafael Mendonça França2013-07-101-0/+0
|\ \ | | | | | | Remove accidentally committed vi .swp file.
| * | Remove accidentally committed vi .swp file.Marc Schütz2013-07-101-0/+0
|/ /
* | Simplify Array#in_groups_of codeAkira Matsuda2013-07-101-3/+1
| |
* | Speed up Array#splitAkira Matsuda2013-07-101-6/+20
| | | | | | | | | | | | | | Benchmark: user system total real old 0.510000 0.000000 0.510000 ( 0.506749) new 0.330000 0.000000 0.330000 ( 0.336187)
* | Speed up String#truncateAkira Matsuda2013-07-101-1/+1
| | | | | | | | | | | | | | Benchmark: user system total real old 1.550000 0.040000 1.590000 ( 1.585866) new 1.250000 0.040000 1.290000 ( 1.287693)
* | Merge pull request #10642 from LTe/invalid-load-errorYves Senn2013-07-105-1/+38
|\ \ | | | | | | Show real LoadError on helpers require
| * | Show real LoadError on helpers requirePiotr Niełacny2013-07-105-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When helper try to require missing file rails will throw exception about missing helper. # app/helpers/my_helper.rb require 'missing' module MyHelper end And when we try do load helper class ApplicationController helper :my end Rails will throw exception. This is wrong because there is a helper file. Missing helper file helpers/my_helper.rb Now when helper try to require non-existed file rails will throw proper exception. No such file to load -- missing
* | | Speed up AS::Inflector.underscoreAkira Matsuda2013-07-101-2/+1
| | | | | | | | | | | | | | | | | | | | | Benchmark: user system total real old 6.090000 0.120000 6.210000 ( 6.202039) new 5.930000 0.110000 6.040000 ( 6.042022)
* | | Speedup AS::Inflector.camelizeAkira Matsuda2013-07-101-1/+3
|/ / | | | | | | | | | | | | Benchmark: user system total real old 5.960000 0.020000 5.980000 ( 5.981754) new 5.740000 0.030000 5.770000 ( 5.757201)
* | Speedup AS::Inflector.deconstantizeAkira Matsuda2013-07-101-1/+1
| | | | | | | | | | | | | | Benchmark: user system total real old 0.740000 0.000000 0.740000 ( 0.744358) new 0.550000 0.000000 0.550000 ( 0.553690)
* | Speedup String#toAkira Matsuda2013-07-101-1/+1
| | | | | | | | | | | | | | | | Benchmark: 1000000.times { str.to(30) } user system total real old 0.490000 0.110000 0.600000 ( 0.607374) new 0.390000 0.000000 0.390000 ( 0.387306)
* | Avoid creating an extra Range instanceAkira Matsuda2013-07-101-1/+1
| |
* | Merge pull request #11385 from MarceloCajueiro/remove_string_interpolationRafael Mendonça França2013-07-091-2/+2
|\ \ | | | | | | Remove unnecessary string interpolation
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 05:37:46 +0000