aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19924 from iamvery/db-tasks-exit-statusSean Griffin2015-10-261-0/+52
|\
| * Exit with non-zero status when db:drop failsJay Hayes2015-10-201-0/+10
| * Exit with non-zero status when db:create failsJay Hayes2015-10-201-0/+17
| * Fix test of drop failureJay Hayes2015-10-201-4/+1
| * Add tests to verify exit status for create/drop failuresJay Hayes2015-10-201-0/+28
* | Tweaked wording used in some tests.Sebastian McKenzie2015-10-251-3/+3
* | Use thor class_option to make the primary_key_type option workRafael Mendonça França2015-10-232-6/+10
* | Move default uuid generation to active_recordJon McCartie2015-10-232-8/+4
* | remove unnecessary readme in dummy applicationyuuji.yaginuma2015-10-232-1/+14
* | `config.generators` should be docummented since it is public APIRafael Mendonça França2015-10-221-1/+1
|/
* Revert " Added an example to show how common secrets can be shared across mul...Sean Griffin2015-10-201-16/+0
* Merge pull request #19898 from prathamesh-sonpatki/common-secretsSean Griffin2015-10-201-0/+16
|\
| * Added example of sharing secrets in multiple environments in secrets.ymlPrathamesh Sonpatki2015-05-261-0/+16
* | Set active_record config for always creating uuids in generatorsJon McCartie2015-10-202-0/+18
* | Merge pull request #21978 from ctreatma/console_helper_reloadSean Griffin2015-10-191-1/+1
|\ \
| * | Fix #21977: Removes memoization of helpers in Rails consoleCharles Treatman2015-10-161-1/+1
* | | remove useless methodyuuji.yaginuma2015-10-181-4/+0
* | | Use "rake time:zones:all" instead of "rake -D time" [ci skip]Marat Galiev2015-10-171-1/+1
|/ /
* | Merge pull request #21961 from Gaurav2728/migration_class_methods_nodocArthur Nogueira Neves2015-10-141-5/+5
|\ \
| * | migrations Class methods have nodoc, fix it for API [ci skip]Gaurav Sharma2015-10-141-5/+5
* | | Merge pull request #20908 from y-yagi/generate_application_job_inside_engineArthur Nogueira Neves2015-10-132-0/+9
|\ \ \
| * | | add application_job.rb to template of mountable engineyuuji.yaginuma2015-07-172-0/+9
* | | | Merge pull request #19135 from yuki24/access-control-supportJeremy Daer2015-10-135-6/+46
|\ \ \ \ | |_|/ / |/| | |
| * | | Add the ability of returning arbitrary headers to ActionDispatch::StaticYuki Nishijima2015-06-135-6/+46
* | | | Merge pull request #17388 from akampjes/masterArthur Nogueira Neves2015-10-121-0/+11
|\ \ \ \
| * | | | ActionMailer https on URL with force_ssl = trueAndrew Kampjes2015-08-141-0/+11
* | | | | do not generate manifest.js in pluginsyuuji.yaginuma2015-10-122-1/+2
* | | | | Merge pull request #21912 from y-yagi/move_prepare_destination_to_publicSean Griffin2015-10-081-1/+2
|\ \ \ \ \
| * | | | | change `prepare_destination` to public API [ci skip]yuuji.yaginuma2015-10-081-1/+2
* | | | | | remove unused requireyuuji.yaginuma2015-10-081-2/+0
|/ / / / /
* | | | | Merge pull request #21804 from merhard/mounted_engine_route_fixAndrew White2015-10-071-0/+49
|\ \ \ \ \
| * | | | | Fix mounted engine named routes regressionMatthew Erhard2015-10-071-0/+49
* | | | | | Output inline is set to true in the plugin.Kasper Timm Hansen2015-10-072-3/+3
* | | | | | Refactor create_test_file to take a pass option.Kasper Timm Hansen2015-10-071-31/+7
* | | | | | Hide Minitest's aggregated results if outputting inline.Kasper Timm Hansen2015-10-072-0/+29
|/ / / / /
* | | | | Update the URL when changing mailer preview formatsJames Kerr2015-10-062-1/+21
* | | | | Use `Mime[:foo]` instead of `Mime::Type[:FOO]` for back compatJeremy Daer2015-10-062-3/+3
* | | | | Merge pull request #20986 from radar/rails-engine-caller-locationsArthur Nogueira Neves2015-10-041-6/+1
|\ \ \ \ \
| * | | | | Remove check for caller_locations in Rails::EngineRyan Bigg2015-07-231-6/+1
* | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-10-042-3/+3
|\ \ \ \ \ \
| * | | | | | Renamed ‘Return’ to ‘Returns’ [ci skip]Ronak Jangir2015-09-282-3/+3
* | | | | | | Revert "removing Rack::Runtime from the default stack."Aaron Patterson2015-10-034-13/+13
* | | | | | | Merge pull request #21851 from y-yagi/use_class_to_specify_middlewareKasper Timm Hansen2015-10-031-1/+1
|\ \ \ \ \ \ \
| * | | | | | | use class to specify the middleware [ci skip]yuuji.yaginuma2015-10-031-1/+1
* | | | | | | | removing Rack::Runtime from the default stack.Aaron Patterson2015-10-024-13/+13
|/ / / / / / /
* | | | | | | Refactor AS::Callbacks halt config and fix the documentationRoque Pinel2015-10-011-3/+4
* | | | | | | only construct one request in an engineAaron Patterson2015-09-302-14/+17
* | | | | | | run against edge sass to eliminate circular require warningsAaron Patterson2015-09-301-4/+0
* | | | | | | call `default_middleware_stack` before merging stacksAaron Patterson2015-09-291-1/+2
* | | | | | | Engines get different middleware than appsAaron Patterson2015-09-293-4/+29