aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Prepare for 4.2.0.beta4 releaseGodfrey Chan2014-10-301-1/+1
|
* On larger screens the email preview iframe is being limited to a height of ↵Edwin Wills2014-10-291-1/+4
| | | | 800 pixels, and the full available screen size is not being used.
* Merge pull request #17423 from lukefx/jruby_windows_tzinfoSantiago Pastorino2014-10-291-2/+2
|\ | | | | Added 'tzinfo-data' if we are using jruby
| * Added 'tzinfo-data' if we are using jrubyLuca Simone2014-10-291-2/+2
| |
* | edit pass over all warningsXavier Noria2014-10-281-1/+1
|/ | | | | | | | | | | | | | | This patch uniformizes warning messages. I used the most common style already present in the code base: * Capitalize the first word. * End the message with a full stop. * "Rails 5" instead of "Rails 5.0". * Backticks for method names and inline code. Also, converted a few long strings into the new heredoc convention.
* Merge pull request #17408 from bf4/fix_rbx_testYves Senn2014-10-281-1/+1
|\ | | | | Fix rbx generated Gemfile regex
| * Fix rbx generated Gemfile regexBenjamin Fleischer2014-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/39190983#L460 1) Failure: AppGeneratorTest#test_psych_gem [test/generators/app_generator_test.rb:495]: Expected /gem 'psych',\s+'~> 2.0', \s+platforms: :rbx/ to match <snip> http://git.io/uuLVag)\ngem 'psych', '~> 2.0', platforms: :rbx\n\n
* | Merge pull request #16229 from byroot/stop-swallowing-url-generation-errorsAndrew White2014-10-271-0/+15
|\ \ | |/ |/| UrlGenerationError are not catched as 404 anymore
| * UrlGenerationError are not catched as 404 anymoreJean Boussier2014-10-271-0/+15
| |
* | Add back --skip-turbolinks and remove --skip-gemsRafael Mendonça França2014-10-263-16/+12
|/ | | | | | | For the most part of cases --skip-gems option just remove one line in the Gemfile. This is not worth for the complexity it adds. Closes #17196
* :nail_care: it's -> its (see comments on 9a586ac)Godfrey Chan2014-10-181-1/+1
|
* [ci skip] A Rails engine is not a man :ok_woman:Zachary Scott2014-10-181-1/+1
|
* Merge pull request #17302 from ↵Rafael Mendonça França2014-10-182-4/+4
| | | | | | claudiob/replace-slower-block-call-with-faster-yield Replace (slower) block.call with (faster) yield
* Revert "Replace (slower) block.call with (faster) yield"Zachary Scott2014-10-182-4/+4
| | | | This reverts commit 0ab075e75f58bf403f7ebe20546c7005f35db1f6.
* Replace (slower) block.call with (faster) yieldclaudiob2014-10-182-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance optimization: `yield` with an implicit `block` is faster than `block.call`. See http://youtu.be/fGFM_UrSp70?t=10m35s and the following benchmark: ```ruby require 'benchmark/ips' def fast yield end def slow(&block) block.call end Benchmark.ips do |x| x.report('fast') { fast{} } x.report('slow') { slow{} } end # => fast 154095 i/100ms # => slow 71454 i/100ms # => # => fast 7511067.8 (±5.0%) i/s - 37445085 in 4.999660s # => slow 1227576.9 (±6.8%) i/s - 6145044 in 5.028356s ```
* Merge pull request #17292 from tricknotes/generator-test-docRafael Mendonça França2014-10-161-1/+1
|\ | | | | Fix example code for `Rails::Generators::Testing::Behaviour` [ci skip]
| * Fix example code for `Rails::Generators::Testing::Behaviour` [ci skip]Ryunosuke SATO2014-10-171-1/+1
| | | | | | | | | | `cleanup_destination_root` method is not found anywhere. Instead, `prepare_destination` clean up distination root on setup.
* | Use released rails-dom-testingRafael Mendonça França2014-10-161-2/+0
|/
* test, `Generators::GeneratedAttribute` with references, required, index.Yves Senn2014-10-161-0/+8
| | | | | | | | | | | | | Closes #17197. Closes #17207. `{required}` is a type modifier so it should be: user:references{required}:index and not: user:references:index{required}
* Merge pull request #17278 from velobuff/clarify-debugger-invocationYves Senn2014-10-161-1/+2
|\ | | | | clarify debugger platform invocation
| * clarify debugger platform invocationRaman Sinha2014-10-151-1/+2
| |
* | some changelog formatting. [ci skip]Yves Senn2014-10-161-1/+1
| |
* | Merge pull request #17280 from aditya-kapoor/remove-unneeded-fileYves Senn2014-10-161-9/+0
|\ \ | | | | | | remove unneeded file from Railties.
| * | remove unneeded fileAditya Kapoor2014-10-161-9/+0
| |/
* / use require_command! instead of calling its definitionAditya Kapoor2014-10-161-1/+1
|/
* Don't need to account turbolinks cookies in get request.Rafael Mendonça França2014-10-131-6/+6
| | | | | | | It was changed to not set the cookie in get requests at https://github.com/rails/turbolinks/commit/62cc3db457ad9745ccda047dd43ab84fb3d89707. Related with dcb05f26.
* Merge pull request #17240 from masarakki/fix-test_helper-of-mountable-pluginRafael Mendonça França2014-10-132-0/+7
|\ | | | | fix test_helper for mountable plugin
| * fix test_helper for mountable pluginmasarakki2014-10-132-0/+7
| |
* | Replace Enumerable#reverse.each with Enumerable#reverse_eachErik Michaels-Ober2014-10-131-1/+1
| |
* | Default generated Gemfile to coffee-rails ~> 4.1.0Joshua Peek2014-10-121-2/+2
|/
* Merge pull request #17088 from robin850/jruby-devRafael Mendonça França2014-10-011-0/+1
|\ | | | | Follow up to #16613
| * Follow up to #16613Robin Dupret2014-09-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since we want this flag to be enabled anytime we are running the tests under JRuby, let's enable this at the Rakefile level so people get the performance boost on their local checkout. Moreover, we avoid having to update this particular line anytime the option changes on the JRuby side. The only drawback is that we have to define it in every Rakefile but there's no big deal, this is already the case for other options.
* | Generate the application pointing to rails-dom-testing masterRafael Mendonça França2014-09-301-0/+2
| | | | | | | | It is temporary until we do the final release
* | correct filename for jobs testsAbdelkader Boudih2014-09-281-1/+1
| |
* | Merge pull request #17077 from schneems/schneems/backtrace-string-allocationsJeremy Kemper2014-09-271-4/+9
|\ \ | |/ |/| Decrease backtrace cleaner object allocations
| * Move object allocation out of loopRichard Schneeman2014-09-271-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now BenchmarkCleaner allocates hundreds of strings on every request with an exception. This patch moves those strings to be generated at boot once and re-used. ## Bench Methods I took a modified form of CodeTriage https://github.com/schneems/codetriage-ko1-test-app/blob/master/perf.rake and ran given rake tasks with and without the patch to BacktraceCleaner. I made an endpoint results in exception ``` def index raise “foo" end ``` The gem `memory_profiler` was used to capture objects allocated for a single request. Then `benchmark/ips` was used to test the speed of the patch. You will see that we use less objects and the code becomes measurably faster with this patch. ## With patch: Memory for one request: ``` Total allocated 7441 Total retained 37 ``` Requests per second: ``` Calculating ------------------------------------- ips 4 i/100ms ------------------------------------------------- ips 43.0 (±4.7%) i/s - 216 in 5.037733s ``` ## Without patch: Memory used for one request: ``` Total allocated 11599 Total retained 35 ``` Requests per second: ``` Calculating ------------------------------------- ips 3 i/100ms ------------------------------------------------- ips 39.4 (±7.6%) i/s - 198 in 5.052783s ``` ## Analysis The patch is faster: ``` (43.0 - 39.4 ) / 39.4 * 100 # => 9 # % ~ speed bump ``` It also allocates less objects: ``` 11599 - 7441 # => 4158 ``` These strings are allocated on __EVERY SINGLE REQUEST__. This patch saves us 4158 objects __PER REQUEST__ with exception. Faster errors == Faster applications
* | Preparing for 4.2.0.beta2 releaseRafael Mendonça França2014-09-261-1/+1
| |
* | remove extra # in cssByron Bischoff2014-09-251-1/+1
| |
* | rails-html-sanitizer is now the defaultRafael Mendonça França2014-09-251-3/+0
| | | | | | | | Also add to upgrading guide a notice about the deprecated sanitizers
* | Remove unused codeRafael Mendonça França2014-09-252-23/+1
| |
* | :nail_care: the CSSRafael Mendonça França2014-09-251-7/+18
| |
* | Merge pull request #17024 from buddhamagnet/amend-welcome-pageRafael Mendonça França2014-09-252-14/+11
|\ \ | | | | | | Amend welcome page
| * | Improve welcome page css and table cell aignments.buddhamagnet2014-09-252-14/+11
| | |
* | | Use released rails-html-sanitizer and rails-deprecated_sanitizerGodfrey Chan2014-09-261-1/+1
| | |
* | | Use release web-consoleRafael Mendonça França2014-09-251-1/+1
| | |
* | | Remove --skip-action-view option from application generatorDan Olson2014-09-245-11/+9
| | |
* | | Fix loading fixtures in engine testsGrzesiek Kolodziejczyk2014-09-231-1/+1
|/ / | | | | | | | | | | | | fixture_path is a class attribute of ActiveSupport::TestCase, so ActiveSupport::TestCase.method_defined?(:fixture_path=) would always return false. This should fix #4971
* / Fix another false assertionsYuki Nishijima2014-09-211-1/+1
|/ | | | | | | | | | | | * The assertions in AS::Duration don't actually assert. * The assertion in Railtie will pass even when `eager_load_namespaces` doesn't include `AppTemplate::Application` if `Rails.application` is truthy. For more details, see here: * https://github.com/rails/rails/pull/16998 * https://github.com/rails/rails/pull/17000
* Merge pull request #16984 from chancancode/fix_16578Godfrey Chan2014-09-221-5/+1
|\ | | | | Document that the default for `rails server -b` has changed
| * Document that the default for `rails server -b` has changedGodfrey Chan2014-09-221-5/+1
| | | | | | | | Fixes #16578