aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Start Rails 5.1 development :tada:Rafael Mendonça França2016-05-1024-5268/+101
|
* Merge pull request #24948 from prathamesh-sonpatki/fix-gemfile-lockKasper Timm Hansen2016-05-101-8/+5
|\ | | | | Fix Gemfile.lock by updating rails-dom-testing
| * Fix Gemfile.lock by updating rails-dom-testingPrathamesh Sonpatki2016-05-101-8/+5
|/ | | | - Followup of https://github.com/rails/rails/pull/24946.
* Merge pull request #24946 from connorshea/patch-1Rafael França2016-05-103-3/+3
|\ | | | | Update rails-dom-testing gem to 2.0
| * Update rails-dom-testing gem to 2.0Connor Shea2016-05-093-3/+3
|/ | | | Resolves #24924.
* Merge pull request #24936 from jkowens/path_checkSantiago Pastorino2016-05-091-6/+2
|\ | | | | use Rack::Utils.valid_path? to check path
| * use Rack::Utils.valid_path? to check pathJordan Owens2016-05-091-6/+2
| | | | | | | | This commit uses the new method in Rack to check if a path is valid.
* | Merge pull request #24929 from rosenfeld/patch-6Santiago Pastorino2016-05-091-1/+18
|\ \ | | | | | | Improve AV changelog with regards to default RAW handler
| * | Improve AV changelog with regards to default RAW handlerRodrigo Rosenfeld Rosas2016-05-091-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-guideVipul A M2016-05-101-2/+2
|\ \ | | | | | | Feature getting started guide [ci skip]
| * | Grammar corrections to Getting Started Guide [ci skip]BV Satyaram2016-05-101-2/+2
|/ /
* | Merge pull request #24937 from pedroadame/masterVipul A M2016-05-101-0/+1
|\ \ | | | | | | Add :ssl/:tls to ActionMailer rdoc [ci skip]
| * | Add :ssl/:tls to ActionMailer [ci skip]Pedro Adame Vergara2016-05-091-0/+1
| | |
* | | Merge pull request #24935 from javan/actioncable-javascript-testsJeremy Daer2016-05-099-0/+4631
|\ \ \ | |/ / |/| | WIP: Action Cable JavaScript tests
| * | Kick off initial JavaScript testsJavan Makhmali2016-05-099-0/+4631
| |/
* | Extract resolver cache disabling to a method.Kasper Timm Hansen2016-05-091-22/+23
| | | | | | | | Will be using this in later code.
* | No need to call `remove_template`.Kasper Timm Hansen2016-05-091-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_loopXavier Noria2016-05-081-2/+2
|\ | | | | Replacement cycle for readability
| * Replacement cycle for readabilityMolchanov Andrey2016-05-091-2/+2
|/
* Merge pull request #24911 from meinac/change_http_to_httpsVipul A M2016-05-091-4/+4
|\ | | | | Change http github links to https [ci skip]
| * Change http github links to https [ci skip]Mehmet Emin İNAÇ2016-05-081-4/+4
| | | | | | | | Follow up to 7d55c846f11a435a4c7aae58f99279a2b9dd8506
* | Merge pull request #24915 from Erol/use-consistent-term-underscoredप्रथमेश Sonpatki2016-05-081-1/+1
|\ \ | | | | | | Use consistent term `underscored`
| * | Use consistent term [skip ci]Erol Fornoles2016-05-081-1/+1
|/ /
* / Use original `Array#sum` to speed up calculatingyui-knk2016-05-071-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-24844Arthur Nogueira Neves2016-05-072-3/+4
|\ | | | | Followup to #24844
| * Followup to #24844Jon Moss2016-05-072-3/+4
|/ | | | | | | Some slight documentation edits and fixes. Also, run remove unnecessary `RuntimeError`. r? @arthurnn
* change cable.coffee to cable.js [ci skip]yuuji.yaginuma2016-05-072-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_loopXavier Noria2016-05-071-2/+1
|\ | | | | Replace `loop` to `until`
| * Replace `loop` to `until`Molchanov Andrey2016-05-071-2/+1
|/
* Merge commit 'fbdcf5221ad7ea3d40ad09651962fc85d101dd67'Matthew Draper2016-05-0722-44/+88
|\ | | | | | | Preparing for 5.0.0.rc1 release
| * Preparing for 5.0.0.rc1 releaseRafael Mendonça França2016-05-0622-44/+88
| |
* | Merge pull request #24886 from rails/maclover7-patch-1Jon Moss2016-05-075-20/+20
|\ \ | | | | | | http --> https
| * | http --> httpsJon Moss2016-05-065-20/+20
| |/ | | | | | | [ci skip]
* | Merge pull request #24904 from jonatack/helpers-grammar-fixesJon Moss2016-05-071-2/+2
|\ \ | |/ |/| Helpers doc grammar fix [skip ci]
| * Helpers doc grammar fix [skip ci]Jon Atack2016-05-071-2/+2
|/
* Fix etag expectation to work with the SHA256Rafael Mendonça França2016-05-061-1/+1
| | | | It is related with https://github.com/rack/rack/commit/7b66d2cdb80a4d6b44fa8c61d92e25fbbda1f152
* Sign the tags when releasingRafael Mendonça França2016-05-061-1/+1
|
* Upgrade all gems to make sure Rails works with rack 2.0.0.rc1Rafael Mendonça França2016-05-061-35/+37
|
* Merge pull request #24844 from arthurnn/arthurnn/connArthur Nogueira Neves2016-05-0611-92/+109
|\ | | | | Refactor connection handler
| * Update docs for connection handlerArthur Neves2016-05-061-2/+5
| | | | | | | | [skip ci]
| * s/specification_name/connection_specification_nameArthur Neves2016-05-064-14/+14
| |
| * s/specification_id/specification_nameArthur Neves2016-05-058-48/+48
| |
| * Retrive the right pool for db tasksArthur Neves2016-05-051-2/+2
| |
| * inline retrive_conn_pool methodArthur Neves2016-05-051-12/+8
| |
| * Better code readabilityArthur Neves2016-05-052-4/+2
| |
| * Test to swap connection at runtimeArthur Neves2016-05-051-0/+7
| |
| * fix testArthur Neves2016-05-051-8/+7
| |
| * Add spec_id testsArthur Neves2016-05-051-0/+9
| |
| * Use spec key, when given as spec_idArthur Neves2016-05-052-20/+23
| |
| * Better specification_id methodArthur Neves2016-05-051-10/+7
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 19:31:04 +0000