aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't generate assets' initializer in `app:update` task if sprockets is skippedTsukuru Tanimichi2018-05-054-1/+22
* Merge pull request #32773 from eugeneius/content_length_multiple_requestsGeorge Claghorn2018-04-302-0/+9
|\
| * Reset CONTENT_LENGTH between test requestsEugene Kenny2018-05-012-0/+9
* | Merge pull request #32775 from elebow/add-quotes-actioncontroller-rdocGeorge Claghorn2018-04-301-1/+1
|\ \ | |/ |/|
| * Add quotes to code in rdoc comment in ActionController [ci skip]Eddie Lebow2018-04-301-1/+1
|/
* Merge pull request #32769 from anthonycrumley/document-active-storage-folderGeorge Claghorn2018-04-301-0/+1
|\
| * Document rails new <app> storage folderAnthony Crumley2018-04-301-0/+1
* | Merge pull request #32768 from anthonycrumley/fix-oxford-commaRafael França2018-04-301-1/+1
|\ \ | |/ |/|
| * Fix an oxford commaAnthony Crumley2018-04-301-1/+1
|/
* Merge pull request #32763 from pvalena/as-fix-threads-nilRafael França2018-04-301-4/+4
|\
| * Fix test: threads being nil in ensurePavel Valena2018-04-301-4/+4
* | Merge pull request #32764 from jroes/patch-1Rafael França2018-04-301-5/+3
|\ \ | |/ |/|
| * Remove reference to TokaidoJonathan Roes2018-04-301-5/+3
|/
* Merge pull request #32756 from houhoulis/fix_example_url_helper_in_testing_guideRyuta Kamizono2018-04-301-4/+4
|\
| * Fix url_helper examples in testing guide [ci skip]Chris Houhoulis2018-04-291-4/+4
|/
* Avoid duplicating downloads from Google Cloud Storage in memoryGeorge Claghorn2018-04-291-2/+2
* Improve the performance of `ActiveSupport::Inflector.ordinal`Ryuta Kamizono2018-04-291-9/+12
* Stream blobs from disk in 5 MB chunksGeorge Claghorn2018-04-292-4/+4
* Merge pull request #32751 from utilum/make_railties_2.6_ci_log_accessible_againRyuta Kamizono2018-04-292-1/+10
|\
| * Make Railties CI log for Ruby 2.6 accessible againutilum2018-04-292-1/+10
* | Merge pull request #32750 from utilum/assert_dir_before_assert_file_in_dirGeorge Claghorn2018-04-291-1/+1
|\ \ | |/ |/|
| * Swap assertion order for better reportingutilum2018-04-291-1/+1
|/
* We usually do not use GH#1234 style in the CHANGELOGs [ci skip]Ryuta Kamizono2018-04-291-1/+1
* Restore original merging order to enforce `if_exists: true`Ryuta Kamizono2018-04-291-2/+1
* Fix `Associations::ClassMethods` doc [ci skip]Ryuta Kamizono2018-04-291-7/+7
* Merge pull request #32747 from printercu/improve_t_helperGeorge Claghorn2018-04-291-8/+2
|\
| * Don't allocate unnecessary array in translation helperMax Melentiev2018-04-281-8/+2
* | Merge pull request #32698 from zealot128/patch-1George Claghorn2018-04-281-0/+172
|\ \ | |/ |/|
| * [ci skip] update ActiveStorage documentationStefan Wienert2018-04-281-0/+172
* | Merge pull request #32745 from pradyumna2905/patch-2Vipul A M2018-04-281-1/+1
|\ \
| * | [ci skip] Fix typo in testing.mdPradyumna Shembekar2018-04-271-1/+1
|/ /
* | Merge pull request #30647 from droptheplot/render-partials-string-localsRafael França2018-04-272-1/+10
|\ \
| * | Allow usage of strings as locals for partial rendererSergey Novikov2017-09-182-1/+10
* | | Merge pull request #32727 from utilum/assert_dont_expectsRafael França2018-04-2716-190/+333
|\ \ \
| * | | assert_called_withutilum2018-04-265-89/+175
| * | | assert_calledutilum2018-04-2612-66/+102
| * | | assert_not_calledutilum2018-04-265-38/+59
* | | | Merge pull request #32733 from Edouard-chin/ec-setupand-teardownRafael França2018-04-273-13/+11
|\ \ \ \
| * | | | `SetupAndTeardown` has few caveats that breaks libraries:Edouard CHIN2018-04-273-13/+11
* | | | | Merge pull request #31956 from fatkodima/has_attached-presence-validationEileen M. Uchitelle2018-04-272-0/+34
|\ \ \ \ \
| * | | | | has_(one/many)_attached presence validationfatkodima2018-02-112-0/+34
* | | | | | Adding precision about which letter case to use for controller names … (#32...simonjamain2018-04-271-0/+2
* | | | | | Ensure that `ids_reader` respects dirty target whether target is loaded or notRyuta Kamizono2018-04-272-3/+5
* | | | | | Merge pull request #32617 from tgturner/size-should-use-available-associationRyuta Kamizono2018-04-273-1/+82
|\ \ \ \ \ \
| * | | | | | Loaded associations should not run a new query when size is calledGraham Turner2018-04-263-1/+82
* | | | | | | Update 'rails_welcome.png' to reflect a more diverse population (#32735)Jamie Dihiansan2018-04-261-0/+0
* | | | | | | Add test case that assigning belongs_to on destroyed object raises frozen errorRyuta Kamizono2018-04-271-0/+7
* | | | | | | Address `Style/StringLiterals` offenceRyuta Kamizono2018-04-271-1/+1
* | | | | | | Don't dup Strings when jsonifyingAkira Matsuda2018-04-271-2/+6
| |_|/ / / / |/| | | | |
* | | | | | Don't try to destoy the given string via method argumentAkira Matsuda2018-04-271-1/+1