aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)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-testingPrathamesh Sonpatki2016-05-101-8/+5
|/
* Merge pull request #24946 from connorshea/patch-1Rafael França2016-05-103-3/+3
|\
| * Update rails-dom-testing gem to 2.0Connor Shea2016-05-093-3/+3
|/
* Merge pull request #24936 from jkowens/path_checkSantiago Pastorino2016-05-091-6/+2
|\
| * use Rack::Utils.valid_path? to check pathJordan Owens2016-05-091-6/+2
* | Merge pull request #24929 from rosenfeld/patch-6Santiago Pastorino2016-05-091-1/+18
|\ \
| * | Improve AV changelog with regards to default RAW handlerRodrigo Rosenfeld Rosas2016-05-091-1/+18
| |/
* | Merge pull request #24942 from bvsatyaram/feature-getting-started-guideVipul A M2016-05-101-2/+2
|\ \
| * | 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 [ci skip]Pedro Adame Vergara2016-05-091-0/+1
* | | Merge pull request #24935 from javan/actioncable-javascript-testsJeremy Daer2016-05-099-0/+4631
|\ \ \ | |/ / |/| |
| * | Kick off initial JavaScript testsJavan Makhmali2016-05-099-0/+4631
| |/
* | Extract resolver cache disabling to a method.Kasper Timm Hansen2016-05-091-22/+23
* | No need to call `remove_template`.Kasper Timm Hansen2016-05-091-1/+0
|/
* Merge pull request #24925 from Neodelf/again_with_loopXavier Noria2016-05-081-2/+2
|\
| * 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]Mehmet Emin İNAÇ2016-05-081-4/+4
* | Merge pull request #24915 from Erol/use-consistent-term-underscoredप्रथमेश Sonpatki2016-05-081-1/+1
|\ \
| * | Use consistent term [skip ci]Erol Fornoles2016-05-081-1/+1
|/ /
* / Use original `Array#sum` to speed up calculatingyui-knk2016-05-071-4/+8
|/
* Merge pull request #24897 from maclover7/jm-fix-24844Arthur Nogueira Neves2016-05-072-3/+4
|\
| * Followup to #24844Jon Moss2016-05-072-3/+4
|/
* change cable.coffee to cable.js [ci skip]yuuji.yaginuma2016-05-072-11/+21
* Merge pull request #24906 from Neodelf/refactoring_loopXavier Noria2016-05-071-2/+1
|\
| * 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 releaseRafael Mendonça França2016-05-0622-44/+88
* | Merge pull request #24886 from rails/maclover7-patch-1Jon Moss2016-05-075-20/+20
|\ \
| * | http --> httpsJon Moss2016-05-065-20/+20
| |/
* | Merge pull request #24904 from jonatack/helpers-grammar-fixesJon Moss2016-05-071-2/+2
|\ \ | |/ |/|
| * 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
* 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
|\
| * Update docs for connection handlerArthur Neves2016-05-061-2/+5
| * 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