aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* prefer require_relative over require + File.expand_pathXavier Noria2016-03-101-1/+1
* Merge pull request #24128 from y-yagi/add_return_values_to_exampleRafael França2016-03-091-1/+1
|\
| * add return values to example [ci skip]yuuji.yaginuma2016-03-101-1/+1
|/
* Revert "Merge pull request #24125 from dharamgollapudi/patch-3"Matthew Draper2016-03-101-0/+0
* Merge pull request #24125 from dharamgollapudi/patch-3Rafael França2016-03-091-0/+0
|\
| * Rename dependencies.rake to cache_digests.rakeDharam Gollapudi2016-03-091-0/+0
|/
* Merge pull request #23940 from prathamesh-sonpatki/rm-with-dispatchersRafael França2016-03-092-14/+15
|\
| * Remove passing `with_dispatchers` to AppGeneratorPrathamesh Sonpatki2016-03-092-14/+15
* | Merge pull request #24123 from mperham/masterRafael França2016-03-092-6/+21
|\ \
| * | Add JSON round trip verification testcaseMike Perham2016-03-092-2/+17
| * | Job payload should be symmetric across JSON dump/loadMike Perham2016-03-092-4/+4
* | | Merge pull request #24121 from y-yagi/use_same_to_type_objectRafael França2016-03-092-2/+2
|\ \ \ | |/ / |/| |
| * | use same name to type objectyuuji.yaginuma2016-03-092-2/+2
* | | Add `ActionController::Parameters#dig`Sean Griffin2016-03-093-0/+40
* | | Merge pull request #24122 from claudiob/fix-23795Rafael França2016-03-092-11/+26
|\ \ \
| * | | AppGenerator: allow both 'rake' and 'rails'claudiob2016-03-092-11/+26
| |/ /
* | | Add changelog entry for #24115 [ci skip]Rafael Mendonça França2016-03-091-0/+5
* | | Merge pull request #24115 from garethson/instrumentation-headersRafael França2016-03-092-0/+7
|\ \ \ | |/ / |/| |
| * | Pass headers through to payload for logging.Gareth du Plooy2016-03-082-0/+7
|/ /
* | Merge pull request #24062 from resure/redundant-escapesRafael França2016-03-084-4/+4
|\ \
| * | Remove redundant regexp escapes in generatorsGadzhi Gadzhiev2016-03-084-4/+4
* | | Merge pull request #23666 from meinac/fix_abstract_default_scope_bugSean Griffin2016-03-085-1/+38
|\ \ \
| * | | Execute default_scope defined by abstract class within the scope of subclassMehmet Emin İNAÇ2016-03-085-1/+38
* | | | Merge pull request #24067 from jch/error-message-when-missing-listen-dependencyArthur Nogueira Neves2016-03-081-1/+7
|\ \ \ \
| * | | | friendly error message if missing listenJerry Cheung2016-03-081-1/+7
|/ / / /
* | | | Merge pull request #24108 from gsamokovarov/web-console-console-plugKasper Timm Hansen2016-03-081-1/+1
|\ \ \ \
| * | | | Advertise the console web-console featureGenadi Samokovarov2016-03-081-1/+1
* | | | | Merge pull request #24102 from st0012/optimize-url-helperRichard Schneeman2016-03-081-11/+11
|\ \ \ \ \
| * | | | | - Freeze strings in frequent used private methodStan Lo2016-03-081-11/+11
| | |/ / / | |/| | |
* | | | | Merge pull request #24106 from gsamokovarov/fix-tests-after-e594000Kasper Timm Hansen2016-03-081-2/+2
|\ \ \ \ \
| * | | | | Fix the tests after e594000Genadi Samokovarov2016-03-081-2/+2
| | |/ / / | |/| | |
* / | | | add test case for schema dumping of PG bytea columns.Yves Senn2016-03-081-0/+9
|/ / / /
* | | | Merge pull request #24104 from gsamokovarov/dont-bound-web-console-versionsRafael França2016-03-082-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Drop the explicit version requirements for web-consoleGenadi Samokovarov2016-03-082-3/+3
|/ / /
* | | Merge pull request #24101 from mechanicles/remove-extra-theArun Agrawal2016-03-081-1/+1
|\ \ \
| * | | Remove extra 'the' and unwanted comma [ci skip]Santosh Wadghule2016-03-081-1/+1
|/ / /
* | | Merge pull request #24034 from kamipo/remove_outdated_commentArthur Nogueira Neves2016-03-071-1/+0
|\ \ \
| * | | Remove outdated comment [ci skip]Ryuta Kamizono2016-03-041-1/+0
* | | | Add changelog for batch touch records.Arthur Neves2016-03-071-0/+15
| |/ / |/| |
* | | Merge pull request #23880 from bronson/extract-integration-behaviorRafael França2016-03-071-22/+35
|\ \ \
| * | | extract ActionDispatch::IntegrationTest::BehaviorScott Bronson2016-03-071-22/+35
* | | | move changelog to right place [skip ci]Arthur Neves2016-03-071-6/+6
* | | | Add changelog for #20997Arthur Neves2016-03-071-0/+6
* | | | Merge pull request #23922 from rthbound/fix-funny-spellingArthur Nogueira Neves2016-03-071-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fixes funny spellingRyan T. Hosford2016-02-261-2/+2
* | | | Merge pull request #24095 from maclover7/rm-incorrect-exampleJon Moss2016-03-071-2/+2
|\ \ \ \
| * | | | Remove incorrect Rack documentation exampleJon Moss2016-03-071-2/+2
|/ / / /
* | | | Merge pull request #23939 from akshaymohite/fix-configuration-tests-semanticsSean Griffin2016-03-071-2/+2
|\ \ \ \
| * | | | Fixed couple of semantics in the configuration_test.rbAkshay2016-02-281-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #23993 from kamipo/no_need_to_extract_limit_for_booleanSean Griffin2016-03-072-5/+1
|\ \ \ \