Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11422 from arunagw/added_missing_actionview | Guillermo Iguaran | 2013-07-13 | 1 | -1/+1 |
|\ | | | | | Added missing actionview in list for release | ||||
| * | Added missing actionview in list for release | Arun Agrawal | 2013-07-13 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #11421 from arunagw/actionpack_activerecord_remove | Guillermo Iguaran | 2013-07-13 | 1 | -91/+0 |
|\ | | | | | Removed unused file! Moved to actionview | ||||
| * | Removed unused file! Moved to actionview | Arun Agrawal | 2013-07-13 | 1 | -91/+0 |
| | | | | | | | | Removed unused file as this has been moved to actionview | ||||
* | | Merge pull request #11413 from envylabs/master | Yves Senn | 2013-07-13 | 1 | -2/+2 |
|\ \ | | | | | | | Remove block argument from callback example. [ci skip] | ||||
| * | | Remove block argument from callback example. | Carlos Souza | 2013-07-13 | 1 | -2/+2 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #11420 from simi/remove_update_application_controller_task | Yves Senn | 2013-07-13 | 2 | -12/+6 |
|\ \ \ | |_|/ |/| | | Remove update:application_controller rake task. | ||||
| * | | Remove update:application_controller rake task. | Josef Šimánek | 2013-07-13 | 2 | -12/+6 |
|/ / | |||||
* | | Merge pull request #11417 from arunagw/gem_source_index_no_required | Yves Senn | 2013-07-13 | 1 | -1/+0 |
|\ \ | | | | | | | Removing Gem.source_index [ci skip] | ||||
| * | | Removing Gem.source_index [ci skip] | Arun Agrawal | 2013-07-13 | 1 | -1/+0 |
| |/ | |||||
* | | Merge pull request #11414 from ankit8898/typo | Yves Senn | 2013-07-13 | 1 | -1/+1 |
|\ \ | |/ |/| | Typo fix [skip ci] | ||||
| * | Typo fix [skip ci] | Ankit Gupta | 2013-07-12 | 1 | -1/+1 |
|/ | |||||
* | add test-case to verify `error.path` when a helper was not found. | Yves Senn | 2013-07-12 | 1 | -0/+5 |
| | | | | | This verifies the code added with: https://github.com/rails/rails/commit/99c9d18601539c7e7e87f26bb047add1f93072af | ||||
* | move `MissingHelperError` out of the `ClassMethods` module. | Yves Senn | 2013-07-12 | 3 | -16/+23 |
| | |||||
* | Merge pull request #11401 from dpdawson/master | Yves Senn | 2013-07-12 | 1 | -2/+2 |
|\ | | | | | Improved Active View Overview guide. [ci skip] | ||||
| * | Improve Active View Overview guide. [ci skip] | Daniel Dawson | 2013-07-12 | 1 | -2/+2 |
| | | |||||
* | | Documment config.log_formatter added on 51aeae91 | Rafael Mendonça França | 2013-07-11 | 1 | -0/+2 |
|/ | | | | [ci skip] | ||||
* | Merge pull request #11400 from dpdawson/master | Yves Senn | 2013-07-11 | 1 | -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 Dawson | 2013-07-11 | 1 | -1/+1 |
|/ | |||||
* | Add missing require | Akira Matsuda | 2013-07-11 | 1 | -0/+1 |
| | |||||
* | Only raise DelegationError if it's is the source of the exception | Andrew White | 2013-07-11 | 3 | -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_precompile | José Valim | 2013-07-10 | 4 | -19/+26 |
|\ | | | | | #11381: Ignore config.eager_load=true for rake | ||||
| * | #11381: Ignore config.eager_load=true for rake | Paul Nikitochkin | 2013-07-10 | 4 | -19/+26 |
| | | | | | | | | Closes #11381 | ||||
* | | Merge pull request #11394 from robin850/patch-8 | Steve Klabnik | 2013-07-10 | 1 | -0/+17 |
|\ \ | | | | | | | Add documentation for add_flash_types [ci skip] | ||||
| * | | Add documentation for add_flash_types [ci skip] | Robin Dupret | 2013-07-10 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | Document a little bit the ActionController::Flash::add_flash_types class method. | ||||
* | | | Add missing require so that DateTime has the right superclass | Andrew White | 2013-07-10 | 1 | -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 #9562 | Andrew White | 2013-07-10 | 1 | -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 Hash | Akira Matsuda | 2013-07-10 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #11391 from schuetzm/remove-swp-file | Rafael Mendonça França | 2013-07-10 | 1 | -0/+0 |
|\ \ | | | | | | | Remove accidentally committed vi .swp file. | ||||
| * | | Remove accidentally committed vi .swp file. | Marc Schütz | 2013-07-10 | 1 | -0/+0 |
|/ / | |||||
* | | Simplify Array#in_groups_of code | Akira Matsuda | 2013-07-10 | 1 | -3/+1 |
| | | |||||
* | | Speed up Array#split | Akira Matsuda | 2013-07-10 | 1 | -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#truncate | Akira Matsuda | 2013-07-10 | 1 | -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-error | Yves Senn | 2013-07-10 | 5 | -1/+38 |
|\ \ | | | | | | | Show real LoadError on helpers require | ||||
| * | | Show real LoadError on helpers require | Piotr Niełacny | 2013-07-10 | 5 | -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.underscore | Akira Matsuda | 2013-07-10 | 1 | -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.camelize | Akira Matsuda | 2013-07-10 | 1 | -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.deconstantize | Akira Matsuda | 2013-07-10 | 1 | -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#to | Akira Matsuda | 2013-07-10 | 1 | -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 instance | Akira Matsuda | 2013-07-10 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #11385 from MarceloCajueiro/remove_string_interpolation | Rafael Mendonça França | 2013-07-09 | 1 | -2/+2 |
|\ \ | | | | | | | Remove unnecessary string interpolation | ||||
| * | | Remove unnecessary string interpolation | Marcelo G. Cajueiro | 2013-07-09 | 1 | -2/+2 |
| | | | | | | | | | | | | Removed from controller template of scaffold generator. | ||||
* | | | fix visibility of the relation construction methods | Aaron Patterson | 2013-07-09 | 1 | -5/+7 |
| | | | |||||
* | | | pass arel to select_all rather than depend on method_missing | Aaron Patterson | 2013-07-09 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #11383 from mattdbridges/simple-format-doc-fix | Rafael Mendonça França | 2013-07-09 | 1 | -1/+1 |
|\ \ | | | | | | | Fix simple_format output example ending tag | ||||
| * | | Fix simple_format output example ending tag | Matt Bridges | 2013-07-09 | 1 | -1/+1 |
| | | | |||||
* | | | Make sure that a joins Relation can be merged with has_many :through + ↵ | Akira Matsuda | 2013-07-10 | 2 | -1/+11 |
| | | | | | | | | | | | | | | | | | | association proxy Closes #11248. | ||||
* | | | Return local time for backwards compatibility | Andrew White | 2013-07-09 | 3 | -10/+27 |
| | | | |||||
* | | | Merge pull request #11378 from wangjohn/class_for_application_generator | Rafael Mendonça França | 2013-07-09 | 2 | -27/+63 |
|\ \ \ | | | | | | | | | Creating a class to handle preparing ARGV. | ||||
| * | | | Creating a class to handle preparing ARGV. | wangjohn | 2013-07-09 | 2 | -27/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | Before the AppGenerator is started, ARGV needs to be modified to correctly account for some things. I'm extracting these out into their own class. |