aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23586 from jhcole/masterप्रथमेश Sonpatki2016-02-101-2/+2
|\ | | | | Fix typo
| * Fix typoJohn Cole2016-02-091-2/+2
|/
* Merge pull request #23584 from ↵Jon Moss2016-02-092-4/+4
|\ | | | | | | | | mgm702/fix_grammar_errors_in_security_and_migrations_docs_master Fix grammar errors in security and migrations docs master [ci skip]
| * Fixed grammatical errors in rails docs [ci skip]Matt Michnal2016-02-092-4/+4
|/ | | | | | Fixed errors in rails migrations docs [ci skip] Fixed errors in rails security docs [ci skip]
* prevent apps in the railties test suite from running the evented monitorXavier Noria2016-02-101-3/+12
|
* include spring-watcher-listen in the Gemfile of new applicationsXavier Noria2016-02-103-0/+9
|
* enables the evented monitor in new applicationsXavier Noria2016-02-105-1/+35
|
* `log_process_action` will return an array, so use `empty?`Aaron Patterson2016-02-091-1/+1
| | | | | We don't need to use active support in this case because we know the type that will be returned.
* Request#fullpath should not raise an exception, so remove the rescueAaron Patterson2016-02-091-1/+1
|
* AC::Request#format always returns a value, so we do not need to tryAaron Patterson2016-02-091-1/+1
|
* Merge pull request #23577 from dgynn/docs_initializersRafael França2016-02-091-4/+16
|\ | | | | Update documentation regarding initializers
| * Update documentation regarding initializers [ci skip]Dave Gynn2016-02-091-4/+16
|/ | | | | | | - Remove ActionController `logger` and `initialize_framework_caches` which were merged into `set_configs` in fbc9d0f4 - Rename ActiveRecord `set_reloader_hooks` changed in 283a0876 - Add missing initializers for ActionController and ActiveRecord
* Merge pull request #23571 from ↵Vipul A M2016-02-091-1/+1
|\ | | | | | | | | y-yagi/remove_deprecated_render_nothing_from_guide remove description of `render :nothing` from guide [ci skip]
| * remove description of `render :nothing` from guide [ci skip]yuuji.yaginuma2016-02-091-1/+1
|/ | | | `:nothing` option was deprecated in 44781b6e9790d90b4f8b9a41d2b2c114b1a582ee
* Merge pull request #23567 from kamipo/fix_typoJon Moss2016-02-081-1/+1
|\ | | | | Fix typo [ci skip]
| * Fix typo [ci skip]Ryuta Kamizono2016-02-091-1/+1
|/
* drop array allocations on `html_safe`Aaron Patterson2016-02-081-1/+1
| | | | | | | | For better or worse, anonymous `*` args will allocate arrays. Ideally, the interpreter would optimize away this allocation. However, given the number of times we call `html_safe` it seems worth the shedding idealism and going for performance. This line was the top allocation spot for a scaffold (and presumably worse on real applications).
* speed up string xor operation and reduce object allocationsAaron Patterson2016-02-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` [aaron@TC rails (master)]$ cat xor.rb a = "\x14b\"\xB4P8\x05\x8D\xC74\xC3\xEC}\xFDf\x8E!h\xCF^\xBF\xA5%\xC6\xF0\xA9\xF9x\x04\xFA\xF1\x82" b = "O.\xF7\x01\xA9D\xA3\xE1D\x7FU\x85\xFC\x8Ak\e\x04\x8A\x97\x91\xD01\x02\xA4G\x1EIf:Y\x0F@" def xor_byte_strings(s1, s2) s1.bytes.zip(s2.bytes).map { |(c1,c2)| c1 ^ c2 }.pack('c*') end def xor_byte_strings2(s1, s2) s2_bytes = s2.bytes s1.bytes.map.with_index { |c1, i| c1 ^ s2_bytes[i] }.pack('c*') end require 'benchmark/ips' require 'allocation_tracer' Benchmark.ips do |x| x.report 'xor_byte_strings' do xor_byte_strings a, b end x.report 'xor_byte_strings2' do xor_byte_strings2 a, b end end ObjectSpace::AllocationTracer.setup(%i{type}) result = ObjectSpace::AllocationTracer.trace do xor_byte_strings a, b end p :xor_byte_strings => result ObjectSpace::AllocationTracer.clear result = ObjectSpace::AllocationTracer.trace do xor_byte_strings2 a, b end p :xor_byte_strings2 => result [aaron@TC rails (master)]$ ruby -I~/git/allocation_tracer/lib xor.rb Calculating ------------------------------------- xor_byte_strings 10.087k i/100ms xor_byte_strings2 11.339k i/100ms ------------------------------------------------- xor_byte_strings 108.386k (± 5.8%) i/s - 544.698k xor_byte_strings2 122.239k (± 3.0%) i/s - 612.306k {:xor_byte_strings=>{[:T_ARRAY]=>[38, 0, 0, 0, 0, 0], [:T_STRING]=>[2, 0, 0, 0, 0, 0]}} {:xor_byte_strings2=>{[:T_ARRAY]=>[3, 0, 0, 0, 0, 0], [:T_DATA]=>[1, 0, 0, 0, 0, 0], [:T_IMEMO]=>[2, 0, 0, 0, 0, 0], [:T_STRING]=>[2, 0, 0, 0, 0, 0]}} ```
* Merge pull request #23565 from abhishekjain16/fix_grammarJon Moss2016-02-081-1/+1
|\ | | | | [ci skip] Fix grammar
| * [ci skip] Fix grammarAbhishek Jain2016-02-091-1/+1
| |
* | Merge pull request #23534 from bronson/fix-redefined-warningArthur Nogueira Neves2016-02-081-0/+1
|\ \ | |/ |/| fix 'method redefined' warnings
| * fix 'method redefined' warningsScott Bronson2016-02-061-0/+1
| |
* | Merge pull request #23563 from pra85/patch-2Jon Moss2016-02-081-1/+1
|\ \ | | | | | | Fix a typo
| * | Fix a typoPrayag Verma2016-02-081-1/+1
|/ / | | | | Replace `a` with `an`
* | Revert "Merge pull request #23562 from Azzurrio/patch-1"Rafael Mendonça França2016-02-081-1/+1
| | | | | | | | | | | | | | This reverts commit 8c3cca5e113213958469b1cec8aa9a664535251a, reversing changes made to 9dcf67c4da35b165301865d9721da1d552f7e03f. Reason: https://github.com/rails/rails/pull/23562#issuecomment-181442569
* | Merge pull request #23562 from Azzurrio/patch-1Kasper Timm Hansen2016-02-081-1/+1
|\ \ | | | | | | Update rails-html-sanitizer version to v1.0.3
| * | Update rails-html-sanitizer version to v1.0.3Karim El-Husseiny2016-02-081-1/+1
|/ / | | | | rails-html-sanitizer 1.0.2 is vulnerable: https://groups.google.com/d/msg/rubyonrails-security/uh--W4TDwmI/m_CVZtdbFQAJ
* | Merge pull request #23560 from prathamesh-sonpatki/rm-rails-4-from-assets-guideप्रथमेश Sonpatki2016-02-081-9/+9
|\ \ | | | | | | Remove references to Rails 4 from assets guide [ci skip]
| * | Remove references to Rails 4 from assets guide [ci skip]Prathamesh Sonpatki2016-02-081-9/+9
| | |
* | | Merge pull request #23552 from bronson/revert-dev-cacheKasper Timm Hansen2016-02-086-54/+49
|\ \ \ | | | | | | | | revert dev:cache to rake task, fixes #23410
| * | | revert dev:cache to rake task, fixes #23410Scott Bronson2016-02-076-54/+49
| | |/ | |/|
* | | Merge pull request #23558 from kamipo/add_numeric_type_in_docVipul A M2016-02-081-3/+3
|\ \ \ | |_|/ |/| | Add numeric type in the doc [ci skip]
| * | Add numeric type in the doc [ci skip]Ryuta Kamizono2016-02-081-3/+3
| | | | | | | | | | | | Follow up to #23508.
* | | Merge pull request #23556 from y-yagi/remove_faye-websocket_from_readmeप्रथमेश Sonpatki2016-02-081-1/+1
|\ \ \ | | | | | | | | remove `faye-websocket` dependency from README [ci skip]
| * | | remove `faye-websocket` dependency from README [ci skip]yuuji.yaginuma2016-02-081-1/+1
| | | | | | | | | | | | | | | | `faye-websocket` gem is no longer used from 322dca293b3716ccaa09e7e82046e539b0d2ffda.
* | | | Merge pull request #23554 from romaimperator/update_action_cable_config_exampleJon Moss2016-02-071-3/+3
|\ \ \ \ | | | | | | | | | | config examples for ActionCable now use Rails.application.config.action_cable
| * | | | config examples for ActionCable now use Rails.application.config.action_cableDaniel Fox2016-02-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some existing examples used ActionCable.server.config but for configuring allowed_request_origins that is overridden in development mode. The correct place to set that is Rails.application.config.action_cable which the ActionCable initializer loads from. I thought the other two examples should be changed as well just in case a default value that would override a configured value is introduced for either log_tags or disable_request_forgery_protection in the future.
* | | | | Merge pull request #23559 from mabras/patch-1Richard Schneeman2016-02-071-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | update turbolinks url [ci skip]
| * | | | update turbolinks url [ci skip]mabras2016-02-081-2/+2
|/ / / /
* | | | Merge pull request #23547 from kamipo/schema_type_returns_symbolSean Griffin2016-02-073-8/+8
|\ \ \ \ | |/ / / |/| | | `schema_type` returns symbol rather than string
| * | | `schema_type` returns symbol rather than stringRyuta Kamizono2016-02-083-8/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | A return value of `schema_type` is used by: 1. primary key type: using as `symbol.inspect` 2. normal column type: using as `symbol.to_s` It is better to return symbol.
* | | Merge pull request #23508 from meinac/add_numeric_type_into_migrationsSean Griffin2016-02-072-0/+12
|\ \ \ | | | | | | | | Added numeric helper into `SchemaStatements` for MySQL and PostgreSQL
| * | | Added numeric helper into migrations.Mehmet Emin İNAÇ2016-02-072-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this addition, you can add a column into the table like: ``` create_table(:numeric_types) do |t| t.numeric :foo, precision: 10, scale: 2, default: 2.0 end ``` The result of the migration above is same with: ``` create_table(:numeric_types) do |t| t.decimal :foo, precision: 10, scale: 2, default: 2.0 end ```
* | | | Merge pull request #23531 from coldnebo/docfixJon Moss2016-02-072-3/+6
|\ \ \ \ | | | | | | | | | | doc changes to clarify asset pipeline
| * | | | doc changesLarry Kyrala2016-02-072-3/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for rails/rails#23431 modified: guides/source/asset_pipeline.md * description of asset combination from apps and gems, e.g. jquery-rails * after @vipulnsward's related change rails/rails#23479 correction: --skip-sprockets will prevent all of these gems, not just sass-rails and uglifier modified: guides/source/working_with_javascript_in_rails.md * noted that rails.js requires the asset pipeline [ci skip]
* | | | Merge pull request #23532 from matthewd/live-interlockMatthew Draper2016-02-084-48/+252
|\ \ \ \ | | | | | | | | | | Hand off the interlock to the new thread in AC::Live
| * | | | Manual yield doesn't block new sharesMatthew Draper2016-02-081-5/+6
| | | | |
| * | | | Test the happy path for recursive yields tooMatthew Draper2016-02-081-0/+35
| | | | |
| * | | | Fix a nonsensical ShareLock test.thedarkone2016-02-071-22/+21
| | | | |
| * | | | Eagerly reacquire when start_sharing is nested inside yield_sharesMatthew Draper2016-02-081-11/+18
| | | | | | | | | | | | | | | | | | | | A full write-preferring wait can lead to deadlock.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 00:10:43 +0000