aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #25317 from prathamesh-sonpatki/fix-api-controller-testsKasper Timm Hansen2016-06-072-7/+7
|\ \ \
| * | | Fix API controller tests by assigning them the encoding typePrathamesh Sonpatki2016-06-072-7/+7
* | | | Merge pull request #25247 from y-yagi/reference_actual_classKasper Timm Hansen2016-06-071-1/+1
|\ \ \ \
| * | | | reference actual class to use middlewareyuuji.yaginuma2016-06-021-1/+1
| | |_|/ | |/| |
* | | | 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-072-2/+4
* | | 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-044-25/+11
* | | 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-0110-155/+59
|\ \
| * | Collapse all new default initializers into a single filePrathamesh Sonpatki2016-05-3110-155/+59
* | | 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-2811-35/+37
* | Fix more assertion counts.Kasper Timm Hansen2016-05-281-2/+2
* | Fix assertion count after 69e1bb52.Kasper Timm Hansen2016-05-281-2/+2
* | Merge pull request #25182 from rails/remove-public-files-for-api-appsDavid Heinemeier Hansson2016-05-282-1/+18
|\ \
| * | Remove public/ files for API appsPrathamesh Sonpatki2016-05-282-1/+18
* | | 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 #25119 from javan/actioncable/blade-buildRafael França2016-05-241-1/+0
|\ \
| * | Remove package:clean taskJavan Makhmali2016-05-241-1/+0
* | | Fixing commands with Markdown formattingAnubhav Saxena2016-05-241-3/+3
* | | Remove version header from railties CHANGELOG.md (#25122)Jon Moss2016-05-241-2/+0
* | | 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
* | | Add backticks to `config/secrets.yml`Jon Moss2016-05-211-1/+1
* | | 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-214-3/+46
* | | | Merge pull request #24918 from prathamesh-sonpatki/cable-assetsRafael França2016-05-212-4/+24
|\ \ \ \ | |_|/ / |/| | |
| * | | Cable: Generate .js or .coffee files while generating channel as per the java...Prathamesh Sonpatki2016-05-172-4/+24
* | | | `md5` --> `MD5`Jon Moss2016-05-171-1/+1
|/ / /
* | / 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-102-530/+3
* | Preparing for 5.0.0.rc1 releaseRafael Mendonça França2016-05-062-1/+6
* | Fix etag expectation to work with the SHA256Rafael Mendonça França2016-05-061-1/+1
* | Fix some typos in comments.Joe Rafaniello2016-05-042-2/+2
* | Prep Rails 5 beta 4eileencodes2016-04-272-1/+3
* | Merge pull request #24696 from y-yagi/remove_unnessary_option_settingKasper Timm Hansen2016-04-254-5/+24
|\ \
| * | register rake options to `OptionParser`yuuji.yaginuma2016-04-252-0/+14
| * | remove unnessary option setting from test runneryuuji.yaginuma2016-04-252-5/+10
* | | removes useless use of string interpolationXavier Noria2016-04-241-2/+2
* | | Fix broken build, channel files are also included in `bin/rails stats` nowPrathamesh Sonpatki2016-04-241-2/+2