Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix DB runtimes on production log | Fernando Tapia Rico | 2016-05-11 | 1 | -2/+1 |
| | | | | | | | | Rails default production configuration establishes "info" as log level. Due to the changes included on commit 191facc857bb4fb52078fb544c6bc1613a81cc80, db runtimes were not being collected if the log level was different than "debug", and 0.0 ms was the runtime reported on production logs. | ||||
* | Merge pull request #24956 from zachattack/patch-1 | Jon Moss | 2016-05-10 | 1 | -1/+1 |
|\ | | | | | Minor syntax change | ||||
| * | Minor syntax change | Zach | 2016-05-10 | 1 | -1/+1 |
|/ | | | While working on this very example recently, I found that Rails will throw POST errors if you leave an empty block in front the `format.js` when using either `remote: true` or vanilla JS/JQuery. | ||||
* | Merge pull request #24950 from kamipo/should_quote_lock_name | Rafael França | 2016-05-10 | 2 | -5/+5 |
|\ | | | | | Should quote `lock_name` to pass to `get_advisory_lock` | ||||
| * | Should quote `lock_name` to pass to `get_advisory_lock` | Ryuta Kamizono | 2016-05-10 | 2 | -5/+5 |
| | | |||||
* | | Merge pull request #24939 from Neodelf/again_with_loop | Xavier Noria | 2016-05-10 | 1 | -2/+1 |
|\ \ | |/ |/| | Replacement cycle for readability | ||||
| * | Replacement cycle for readability | Molchanov Andrey | 2016-05-10 | 1 | -2/+1 |
| | | |||||
* | | Use sass-rails and coffee-rails that work with Rails 5.1 | Rafael Mendonça França | 2016-05-10 | 1 | -2/+2 |
| | | |||||
* | | Update Ruby report templates | Rafael Mendonça França | 2016-05-10 | 3 | -3/+3 |
| | | |||||
* | | Bump the deprecation horizon | Rafael Mendonça França | 2016-05-10 | 2 | -2/+2 |
| | | |||||
* | | Add migration compatibility class for Rails 5.1 | Rafael Mendonça França | 2016-05-10 | 1 | -1/+4 |
| | | |||||
* | | Start Rails 5.1 development :tada: | Rafael Mendonça França | 2016-05-10 | 24 | -5268/+101 |
| | | |||||
* | | Merge pull request #24948 from prathamesh-sonpatki/fix-gemfile-lock | Kasper Timm Hansen | 2016-05-10 | 1 | -8/+5 |
|\ \ | | | | | | | Fix Gemfile.lock by updating rails-dom-testing | ||||
| * | | Fix Gemfile.lock by updating rails-dom-testing | Prathamesh Sonpatki | 2016-05-10 | 1 | -8/+5 |
|/ / | | | | | | | - Followup of https://github.com/rails/rails/pull/24946. | ||||
* | | Merge pull request #24946 from connorshea/patch-1 | Rafael França | 2016-05-10 | 3 | -3/+3 |
|\ \ | | | | | | | Update rails-dom-testing gem to 2.0 | ||||
| * | | Update rails-dom-testing gem to 2.0 | Connor Shea | 2016-05-09 | 3 | -3/+3 |
|/ / | | | | | | | Resolves #24924. | ||||
* | | Merge pull request #24936 from jkowens/path_check | Santiago Pastorino | 2016-05-09 | 1 | -6/+2 |
|\ \ | | | | | | | use Rack::Utils.valid_path? to check path | ||||
| * | | use Rack::Utils.valid_path? to check path | Jordan Owens | 2016-05-09 | 1 | -6/+2 |
| | | | | | | | | | | | | This commit uses the new method in Rack to check if a path is valid. | ||||
* | | | Merge pull request #24929 from rosenfeld/patch-6 | Santiago Pastorino | 2016-05-09 | 1 | -1/+18 |
|\ \ \ | | | | | | | | | Improve AV changelog with regards to default RAW handler | ||||
| * | | | Improve AV changelog with regards to default RAW handler | Rodrigo Rosenfeld Rosas | 2016-05-09 | 1 | -1/+18 |
| |/ / | | | | | | | | | | It highlights which kind of incompatibilities this could lead to when rendering plain JS or HTML partials. | ||||
* | | | Merge pull request #24942 from bvsatyaram/feature-getting-started-guide | Vipul A M | 2016-05-10 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Feature getting started guide [ci skip] | ||||
| * | | | Grammar corrections to Getting Started Guide [ci skip] | BV Satyaram | 2016-05-10 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #24937 from pedroadame/master | Vipul A M | 2016-05-10 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | Add :ssl/:tls to ActionMailer rdoc [ci skip] | ||||
| * | | Add :ssl/:tls to ActionMailer [ci skip] | Pedro Adame Vergara | 2016-05-09 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #24935 from javan/actioncable-javascript-tests | Jeremy Daer | 2016-05-09 | 9 | -0/+4631 |
|\ \ \ | |/ / |/| | | WIP: Action Cable JavaScript tests | ||||
| * | | Kick off initial JavaScript tests | Javan Makhmali | 2016-05-09 | 9 | -0/+4631 |
| |/ | |||||
* | | Extract resolver cache disabling to a method. | Kasper Timm Hansen | 2016-05-09 | 1 | -22/+23 |
| | | | | | | | | Will be using this in later code. | ||||
* | | No need to call `remove_template`. | Kasper Timm Hansen | 2016-05-09 | 1 | -1/+0 |
|/ | | | | | Each test executes in another tmp folder, so there's no chance of polluting another test run. | ||||
* | Merge pull request #24925 from Neodelf/again_with_loop | Xavier Noria | 2016-05-08 | 1 | -2/+2 |
|\ | | | | | Replacement cycle for readability | ||||
| * | Replacement cycle for readability | Molchanov Andrey | 2016-05-09 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #24911 from meinac/change_http_to_https | Vipul A M | 2016-05-09 | 1 | -4/+4 |
|\ | | | | | Change http github links to https [ci skip] | ||||
| * | Change http github links to https [ci skip] | Mehmet Emin İNAÇ | 2016-05-08 | 1 | -4/+4 |
| | | | | | | | | Follow up to 7d55c846f11a435a4c7aae58f99279a2b9dd8506 | ||||
* | | Merge pull request #24915 from Erol/use-consistent-term-underscored | प्रथमेश Sonpatki | 2016-05-08 | 1 | -1/+1 |
|\ \ | | | | | | | Use consistent term `underscored` | ||||
| * | | Use consistent term [skip ci] | Erol Fornoles | 2016-05-08 | 1 | -1/+1 |
|/ / | |||||
* / | Use original `Array#sum` to speed up calculating | yui-knk | 2016-05-07 | 1 | -4/+8 |
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use original `Array#sum` when calculating Numeric sum. This commit is related #24804 issue. Issue #24804 reports `Array#sum` becomes much slower when ActiveSupport is included. This commit tries to use original method as far as possible. ```shell $ cat array_sum.rb class Array alias core_sum sum end require 'benchmark/ips' require 'active_support/core_ext/enumerable' ary = [1.0] * 1_000_000 Benchmark.ips do |x| x.report("core sum") { ary.core_sum } x.report("AS's sum") { ary.sum } x.compare! end $ bundle exec ruby -v -I lib array_sum.rb ruby 2.4.0dev (2016-05-01 master 54867) [x86_64-darwin14] Calculating ------------------------------------- core sum 4.000 i/100ms AS's sum 5.000 i/100ms ------------------------------------------------- core sum 50.492 (± 7.9%) i/s - 252.000 AS's sum 50.116 (± 6.0%) i/s - 250.000 Comparison: core sum: 50.5 i/s AS's sum: 50.1 i/s - 1.01x slower ``` Signed-off-by: Jeremy Daer <jeremydaer@gmail.com> | ||||
* | Merge pull request #24897 from maclover7/jm-fix-24844 | Arthur Nogueira Neves | 2016-05-07 | 2 | -3/+4 |
|\ | | | | | Followup to #24844 | ||||
| * | Followup to #24844 | Jon Moss | 2016-05-07 | 2 | -3/+4 |
|/ | | | | | | | Some slight documentation edits and fixes. Also, run remove unnecessary `RuntimeError`. r? @arthurnn | ||||
* | change cable.coffee to cable.js [ci skip] | yuuji.yaginuma | 2016-05-07 | 2 | -11/+21 |
| | | | | | In #23935, cable file was to be provided by the javascript instead of coffeescript, doc was also been modified to use javascript. | ||||
* | Merge pull request #24906 from Neodelf/refactoring_loop | Xavier Noria | 2016-05-07 | 1 | -2/+1 |
|\ | | | | | Replace `loop` to `until` | ||||
| * | Replace `loop` to `until` | Molchanov Andrey | 2016-05-07 | 1 | -2/+1 |
|/ | |||||
* | Merge commit 'fbdcf5221ad7ea3d40ad09651962fc85d101dd67' | Matthew Draper | 2016-05-07 | 22 | -44/+88 |
|\ | | | | | | | Preparing for 5.0.0.rc1 release | ||||
| * | Preparing for 5.0.0.rc1 release | Rafael Mendonça França | 2016-05-06 | 22 | -44/+88 |
| | | |||||
* | | Merge pull request #24886 from rails/maclover7-patch-1 | Jon Moss | 2016-05-07 | 5 | -20/+20 |
|\ \ | | | | | | | http --> https | ||||
| * | | http --> https | Jon Moss | 2016-05-06 | 5 | -20/+20 |
| |/ | | | | | | | [ci skip] | ||||
* | | Merge pull request #24904 from jonatack/helpers-grammar-fixes | Jon Moss | 2016-05-07 | 1 | -2/+2 |
|\ \ | |/ |/| | Helpers doc grammar fix [skip ci] | ||||
| * | Helpers doc grammar fix [skip ci] | Jon Atack | 2016-05-07 | 1 | -2/+2 |
|/ | |||||
* | Fix etag expectation to work with the SHA256 | Rafael Mendonça França | 2016-05-06 | 1 | -1/+1 |
| | | | | It is related with https://github.com/rack/rack/commit/7b66d2cdb80a4d6b44fa8c61d92e25fbbda1f152 | ||||
* | Sign the tags when releasing | Rafael Mendonça França | 2016-05-06 | 1 | -1/+1 |
| | |||||
* | Upgrade all gems to make sure Rails works with rack 2.0.0.rc1 | Rafael Mendonça França | 2016-05-06 | 1 | -35/+37 |
| | |||||
* | Merge pull request #24844 from arthurnn/arthurnn/conn | Arthur Nogueira Neves | 2016-05-06 | 11 | -92/+109 |
|\ | | | | | Refactor connection handler |