aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #25317 from prathamesh-sonpatki/fix-api-controller-testsKasper Timm Hansen2016-06-071-5/+5
|\
| * Fix API controller tests by assigning them the encoding typePrathamesh Sonpatki2016-06-071-5/+5
* | Flag `to_time` + simplify version names.Kasper Timm Hansen2016-06-071-5/+6
|/
* Use the `update` flag to provide more friendlier messages to people upgrading.Prathamesh Sonpatki2016-06-071-12/+9
* Remove FORCE option as it was only needed for testsPrathamesh Sonpatki2016-06-071-1/+1
* Update the documentation of new_framework_defaults file with more details abo...Prathamesh Sonpatki2016-06-041-13/+16
* Fix minor regression about old apps not getting per_form_csrf and request_for...Prathamesh Sonpatki2016-06-043-8/+5
* More cleanup of new framework defaultsPrathamesh Sonpatki2016-06-041-18/+12
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-06-031-1/+1
|\
| * `behaviour` --> `behavior`Jon Moss2016-05-271-1/+1
* | Properly support reloading for Action Cable channelsMatthew Draper2016-06-022-2/+0
* | Merge pull request #25231 from prathamesh-sonpatki/collapse-new-initializersDavid Heinemeier Hansson2016-06-018-62/+40
|\ \
| * | Collapse all new default initializers into a single filePrathamesh Sonpatki2016-05-318-62/+40
* | | Bump jbuilder dependency to version 2.5.0 for compatibility fixesDavid Heinemeier Hansson2016-05-311-1/+1
|/ /
* | Move new default initializers into separate directoryPrathamesh Sonpatki2016-05-288-15/+17
* | Merge pull request #25182 from rails/remove-public-files-for-api-appsDavid Heinemeier Hansson2016-05-281-0/+11
|\ \
| * | Remove public/ files for API appsPrathamesh Sonpatki2016-05-281-0/+11
* | | Redirects are to urls, not pathsDavid Heinemeier Hansson2016-05-281-3/+3
* | | The first comment does not explain anything that the code doesnt and the seco...David Heinemeier Hansson2016-05-281-2/+0
* | | Boil down custom Action Cable configuration to a single blockDavid Heinemeier Hansson2016-05-281-4/+2
|/ /
* | Merge pull request #25061 from eugeneius/rails_max_threads_mysql_sqliteRichard Schneeman2016-05-2410-2/+10
|\ \
| * | Use RAILS_MAX_THREADS as pool size on all adaptersEugene Kenny2016-05-2410-2/+10
* | | Fix and optimize scaffold CSS [ci skip]Andrii Ponomarov2016-05-221-8/+4
* | | Merge pull request #24170 from maclover7/fix-24168Rafael França2016-05-211-2/+1
|\ \ \
| * | | Un-hide helper and assets options for controller generatorJon Moss2016-03-121-2/+1
* | | | Added a shared section to config/secrets.yml that will be loaded for all envi...David Heinemeier Hansson2016-05-212-3/+16
* | | | Cable: Generate .js or .coffee files while generating channel as per the java...Prathamesh Sonpatki2016-05-171-0/+4
| |/ / |/| |
* | | reorder env keys in the generated config/cable.ymlXavier Noria2016-05-151-5/+4
| |/ |/|
* | Use sass-rails and coffee-rails that work with Rails 5.1Rafael Mendonça França2016-05-101-2/+2
* | Start Rails 5.1 development :tada:Rafael Mendonça França2016-05-101-2/+2
* | Preparing for 5.0.0.rc1 releaseRafael Mendonça França2016-05-061-1/+1
* | Fix some typos in comments.Joe Rafaniello2016-05-041-1/+1
* | Prep Rails 5 beta 4eileencodes2016-04-271-1/+1
* | Merge pull request #24696 from y-yagi/remove_unnessary_option_settingKasper Timm Hansen2016-04-252-5/+5
|\ \
| * | register rake options to `OptionParser`yuuji.yaginuma2016-04-251-0/+3
| * | remove unnessary option setting from test runneryuuji.yaginuma2016-04-251-5/+2
* | | removes useless use of string interpolationXavier Noria2016-04-241-2/+2
* | | add channels files in `stats` taskyuuji.yaginuma2016-04-241-0/+1
* | | Add compatibility for Ruby 2.4 `to_time` changesAndrew White2016-04-232-0/+15
|/ /
* | Merge pull request #24664 from y-yagi/use_wrapper_file_to_add_rake_task_for_e...Rafael França2016-04-211-1/+1
|\ \
| * | use wrapper file to add rake task for enginesyuuji.yaginuma2016-04-211-1/+1
* | | use rails command in `time:zones` task desc [ci skip]yuuji.yaginuma2016-04-201-1/+1
|/ /
* | Merge pull request #20625 from Envek/add_country_zones_methodJeremy Daer2016-04-191-6/+23
|\ \
* | | mention rails 5 instead of rails 4 in bin/rails for pluginsBen A. Morgan2016-04-191-1/+2
|/ /
* | removes unneeded require in rails/railtie.rbXavier Noria2016-04-181-2/+1
* | Merge pull request #24490 from prathamesh-sonpatki/add-config-to-deprecation-...Santiago Pastorino2016-04-111-3/+3
|\ \
| * | Add `config` to the deprecation warnings of deprecated config optionsPrathamesh Sonpatki2016-04-101-3/+3
* | | edit pass over the RDoc of Rails::Railtie [ci skip]Xavier Noria2016-04-111-36/+36
* | | remove explicit curlies for hash argumentXavier Noria2016-04-111-2/+2
* | | issue FileUtils commands directly in Rake tasksXavier Noria2016-04-113-14/+11