aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use same name to type objectyuuji.yaginuma2016-03-092-2/+2
* 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
|\ \ \ \
| * | | | No need to extract a limit for a boolean typeRyuta Kamizono2016-03-042-5/+1
* | | | | Merge pull request #24086 from yui-knk/do_not_ad_integration_test_classYves Senn2016-03-073-2/+9
|\ \ \ \ \
| * | | | | Prevent not-intended loading of `ActionDispatch::IntegrationTest`yui-knk2016-03-073-2/+9
* | | | | | Merge pull request #24091 from mcfiredrill/fix-helper-method-docsRafael França2016-03-071-1/+2
|\ \ \ \ \ \
| * | | | | | clarify that helper_method makes both methods available in the viewTony Miller2016-03-071-1/+2
* | | | | | | Merge pull request #24090 from meinac/silence_deprecation_warning_action_view...Rafael França2016-03-061-6/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Silence deprecation message for dynamic controller and actions on action_view...Mehmet Emin İNAÇ2016-03-071-6/+8
|/ / / / / /
* | | | | | Merge pull request #24085 from vipulnsward/i18n-test-additionKasper Timm Hansen2016-03-061-1/+7
|\ \ \ \ \ \
| * | | | | | - Added i18n test to verify assigning hash directly to fallbacks instead of u...Vipul A M2016-03-061-1/+7
* | | | | | | prefer require_relative over require + File.expand_pathXavier Noria2016-03-064-4/+5
* | | | | | | use __dir__ for relative paths in config/application.rbXavier Noria2016-03-062-2/+2
* | | | | | | use __dir__ for relative paths in config/boot.rbXavier Noria2016-03-062-3/+3
* | | | | | | use __dir__ to load the application in environment.rbXavier Noria2016-03-061-1/+1
* | | | | | | use __dir__ to load the environment in config.ruXavier Noria2016-03-061-1/+1
* | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-03-069-32/+32
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Update all guides with `null: false` change in migrationsPrathamesh Sonpatki2016-03-033-23/+23
| * | | | | | | [ci skip] Update getting started guide for chanages in migrations APIPrathamesh Sonpatki2016-03-031-3/+3
| * | | | | | | [ci skip] fix json outputMikhail Dieterle2016-02-271-1/+1