aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| * | Remove unnecessary string interpolationMarcelo G. Cajueiro2013-07-091-2/+2
| | | | | | | | | | | | Removed from controller template of scaffold generator.
* | | fix visibility of the relation construction methodsAaron Patterson2013-07-091-5/+7
| | |
* | | pass arel to select_all rather than depend on method_missingAaron Patterson2013-07-091-1/+1
| |/ |/|
* | Merge pull request #11383 from mattdbridges/simple-format-doc-fixRafael Mendonça França2013-07-091-1/+1
|\ \ | | | | | | Fix simple_format output example ending tag
| * | Fix simple_format output example ending tagMatt Bridges2013-07-091-1/+1
| | |
* | | Make sure that a joins Relation can be merged with has_many :through + ↵Akira Matsuda2013-07-102-1/+11
| | | | | | | | | | | | | | | | | | association proxy Closes #11248.
* | | Return local time for backwards compatibilityAndrew White2013-07-093-10/+27
| | |
* | | Merge pull request #11378 from wangjohn/class_for_application_generatorRafael Mendonça França2013-07-092-27/+63
|\ \ \ | | | | | | | | Creating a class to handle preparing ARGV.
| * | | Creating a class to handle preparing ARGV.wangjohn2013-07-092-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.
* | | | Retain UTC offset when using Time.at_with_coercionAndrew White2013-07-093-3/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The standard Ruby behavior for Time.at is to return the same type of time when passing an instance of Time as a single argument. Since the an ActiveSupport::TimeWithZone instance may be a different timezone than the system timezone and DateTime just understands offsets the best we can do is to return an instance of Time with the correct offset. Fixes #11350.
* | | | Fix microsecond precision of Time#at_with_coercionNeer Friedman2013-07-092-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Time.at_with_coercion (wraps Time.at) is called with a single argument that "acts_like?(:time)" it is coerced to integer thus losing it's microsecond percision. This commits changes this to use `#to_f` to prevent the problem
* | | | Merge pull request #11372 from wangjohn/fixing_rails_commands_classRafael Mendonça França2013-07-091-2/+2
|\ \ \ \ | |/ / / |/| | | Using the instance variable for argv.
| * | | Using the instance variable for argv.wangjohn2013-07-091-2/+2
|/ / / | | | | | | | | | | | | Instead of using the global constant ARGV, we're changing to using the instance variable because it is more testable.
* | | Merge pull request #11375 from namusyaka/fix_attribute_for_inspectRafael Mendonça França2013-07-092-3/+3
|\ \ \ | | | | | | | | Fix: attribute_for_inspect truncate upto (51 => 50) characters.
| * | | Fix: attribute_for_inspect truncate upto (51 => 50) characters.namusyaka2013-07-092-3/+3
|/ / /
* | | Merge pull request #11174 from vipulnsward/remove_column_passingRafael Mendonça França2013-07-091-2/+2
|\ \ \ | | | | | | | | Stop sending column info to `substitute_at` as it doesn't get utilized.
| * | | Document where `column` param gets utilized in `substitute_at`.Vipul A M2013-07-011-2/+2
| | | |
* | | | Merge pull request #11073 from tricknotes/improve-guides-jsRafael Mendonça França2013-07-092-36/+32
|\ \ \ \ | | | | | | | | | | Improve guides js
| * | | | Improve js written for guidesRyunosuke SATO2013-06-252-36/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Stop using unnecessary global variable * Use function defined by jQuery for simplicity * Fix event listner for "more info button" to handle event on resize browser
* | | | | Merge pull request #11143 from robin850/upgrading-railsRafael Mendonça França2013-07-091-1/+23
|\ \ \ \ \ | | | | | | | | | | | | Add few information about missing steps [ci skip]
| * | | | | Add few information about missing steps [ci skip]Robin Dupret2013-06-291-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some deprecations previously note covered such as the confirm option for the link_to helper or options which aren't needed anymore Also add a mention about the config.assets.js_compressor option.
* | | | | | Merge pull request #11354 from jadeatucker/cache_exists_should_return_booleanRafael Mendonça França2013-07-092-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | cache.exists? should return true/false
| * | | | | | Explicitly test for true and false.Jade Tucker2013-07-071-2/+2
| | | | | | |
| * | | | | | cache.exists? should return true/falseJade Tucker2013-07-071-1/+1
| | | | | | |
* | | | | | | Merge pull request #11351 from jetthoughts/cleanup_requestRafael Mendonça França2013-07-091-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use content_length method instead of ENV['CONTENT_LENGTH'].to_i
| * | | | | | | Use helper method to get ENV['CONTENT_LENGTH']Paul Nikitochkin2013-07-081-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #11353 from jetthoughts/revert_to_raw_postRafael Mendonça França2013-07-093-1/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use Request#raw_post instead Request#body in ParamsParser#parse_formatted_parameters
| * | | | | | | Use Request#raw_post instead Request#bodyPaul Nikitochkin2013-07-083-1/+15
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to get raw_post to be not empty after ParamsParser#parse_formatted_parameters, added rewinding of body stream input on parsing json params. Closes #11345
* | | | | | | Merge pull request #11361 from jetthoughts/add_cursor_pointer_for_menuRafael Mendonça França2013-07-091-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added cursor pointer for 'More Ruby on Rails' dropdown menu on guides page (which appear on small windows)
| * | | | | | | Added cursor pointer for 'More Ruby on Rails'Paul Nikitochkin2013-07-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dropdown menu on guides page (which appear on small windows) [ci skip]
* | | | | | | | Merge pull request #11368 from Amit-Thawait/masterRafael Mendonça França2013-07-091-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixed Travis CI link for rails
| * | | | | | | | link break added after the Travis CI linkAmit Thawait2013-07-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | link break added after the Travis CI link
| * | | | | | | | Fixed broken link of Travis CI for rails and added full pathAmit Thawait2013-07-081-2/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #11373 from vipulnsward/remove_deprecated_testRafael Mendonça França2013-07-091-7/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Remove redundant test about `push_with_attributes` removal.
| * | | | | | | | Remove redundant test about `push_with_attributes` removal.Vipul A M2013-07-091-7/+0
|/ / / / / / / /
* | | | | | | | close our connection when we are doneAaron Patterson2013-07-082-14/+17
| | | | | | | |
* | | | | | | | remove dead codeAaron Patterson2013-07-081-16/+0
| | | | | | | |
* | | | | | | | if we remove the connection from the pool, we should close itAaron Patterson2013-07-081-0/+1
| | | | | | | |
* | | | | | | | use latches rather than mucking with the schedulerAaron Patterson2013-07-081-7/+7
| | | | | | | |
* | | | | | | | Merge pull request #11371 from arunagw/actionview-changesRafael Mendonça França2013-07-083-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Actionview changes
| * | | | | | | | Removed unused require from actionview rakefile.Arun Agrawal2013-07-091-1/+0
| | | | | | | | |
| * | | | | | | | Fixed broken rake task for update_version [ci skip]Arun Agrawal2013-07-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added actionview to update version rake task