aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Don't upgrade config.file_watcher during upgrade pathGarrett Bjerkhoel2016-03-181-0/+5
* Merge pull request #22518 from RochesterinNYC/better-error-message-for-includ...Arthur Nogueira Neves2016-03-182-1/+18
|\
| * Improve clarity of error message for missing includes and eager_loadJames Wen2016-01-282-1/+18
* | Merge pull request #24223 from mechanicles/reserved-keys-testsEileen M. Uchitelle2016-03-181-6/+7
|\ \
| * | Added more tests for reserved hash keys of ActiveJob::Arguments.Santosh Wadghule2016-03-171-6/+7
* | | Merge pull request #24226 from mabras/masterXavier Noria2016-03-181-0/+0
|\ \ \
| * | | use rails 5 favicon.ico for rails guidesMohamad Abras2016-03-171-0/+0
* | | | Evented Redis adapter: log reconnect failures as errors, not just infoJeremy Daer2016-03-171-1/+1
|/ / /
* | | Merge pull request #24218 from schneems/schneems/match-loggerRichard Schneeman2016-03-172-10/+26
|\ \ \
| * | | Document and Match the Rails logger interfaceschneems2016-03-162-10/+26
| |/ /
* | | Merge pull request #24201 from rails/rake-db-createRafael França2016-03-173-10/+17
|\ \ \ | |/ / |/| |
| * | Creates development and test databases in db:migrate taskRafael Mendonça França2016-03-143-10/+17
* | | Merge pull request #24215 from shiraikenta/modify-atom-feed-helper-rbJon Moss2016-03-161-1/+1
|\ \ \
| * | | fix a comment in atom_feed_helper.rb白井 健太2016-03-161-1/+1
|/ / /
* | | Merge pull request #24205 from delftswa2016/improve-activesupport-dependenciesXavier Noria2016-03-161-3/+6
|\ \ \
| * | | Improve code readability in ActiveSupport::DependenciesAaron Ang2016-03-161-5/+6
| * | | Add comments to ActiveSupport::Dependencies to help understandingAaron Ang2016-03-161-0/+2
* | | | adds .gitattributes to enable Ruby-awarenessXavier Noria2016-03-161-0/+2
|/ / /
* | | no need to clear an unusued collectionXavier Noria2016-03-161-1/+1
* | | removes unreachable codeXavier Noria2016-03-161-2/+0
* | | tests the raising/throwing discards the watching stackXavier Noria2016-03-163-4/+8
* | | s/removes/discards/Xavier Noria2016-03-161-2/+2
* | | adds coverage for raising while autoloadingXavier Noria2016-03-162-0/+12
* | | adds coverage for throwing while autoloadingXavier Noria2016-03-152-0/+14
* | | Share dev caching implementation between task and server.Kasper Timm Hansen2016-03-153-25/+46
* | | Merge pull request #24204 from sand33pn/masterVipul A M2016-03-151-1/+1
|\ \ \
| * | | Update action_controller_overview.mdSandeep Navghane2016-03-151-1/+1
|/ / /
* | | Merge pull request #24198 from delftswa2016/remove-log-related-stuffXavier Noria2016-03-153-51/+0
|\ \ \ | |/ / |/| |
| * | Remove log-related stuff from ActiveSupport::DependenciesAaron Ang2016-03-153-51/+0
|/ /
* | Merge pull request #24188 from wiehann/railsguide-fixJon Moss2016-03-141-1/+1
|\ \
| * | Correct command for generating secret_key_base [ci skip]Wiehann2016-03-141-1/+1
* | | Merge pull request #24187 from akihiro17/fix-find-docArthur Nogueira Neves2016-03-141-2/+2
|\ \ \ | |/ / |/| |
| * | [ci skip] Fix the FinderMethods#find documentakihiro172016-03-141-2/+2
|/ /
* | Merge pull request #24184 from y-yagi/add_queue_classic_to_listप्रथमेश Sonpatki2016-03-141-3/+4
|\ \
| * | add `queue_classic` to list of provide `provider_job_id` [ci skip]yuuji.yaginuma2016-03-141-3/+4
|/ /
* | Merge pull request #24175 from y-yagi/add_headers_to_payloadJon Moss2016-03-121-0/+4
|\ \
| * | add headers to payload list [ci skip]yuuji.yaginuma2016-03-131-0/+4
* | | Merge pull request #24174 from y-yagi/silence_deprecation_messageArthur Nogueira Neves2016-03-121-1/+3
|\ \ \
| * | | silence deprecation message for dynamic controller and actions on Action View...yuuji.yaginuma2016-03-131-1/+3
| |/ /
* | | Merge pull request #24171 from bdewater/strong_parameters_anaf_docAndrew White2016-03-121-2/+3
|\ \ \
| * | | Add explanation about accepts_nested_attributes_for keys in the strong parame...Bart de Water2016-03-121-2/+3
| |/ /
* | | Merge pull request #24166 from kamipo/fix_warning_method_redefinedAndrew White2016-03-121-3/+0
|\ \ \ | |/ / |/| |
| * | Fix `warning: method redefined; discarding old female`Ryuta Kamizono2016-03-121-3/+0
|/ /
* | Merge pull request #24163 from prathamesh-sonpatki/fix-gemfile-lockRafael França2016-03-121-1/+1
|\ \
| * | Fix Gemfile.lockPrathamesh Sonpatki2016-03-121-1/+1
|/ /
* | Merge pull request #24161 from Sen-Zhang/restore_application_mailerRafael França2016-03-113-0/+16
|\ \
| * | improve some codeSen-Zhang2016-03-111-2/+4
| * | generate application_mailer.rb if it is missingSen-Zhang2016-03-113-0/+14
|/ /
* | AC: skip PG adapter tests if the db isn't availableJeremy Daer2016-03-111-0/+7
* | Merge pull request #23797 from kamipo/case_sensitive_comparison_for_non_strin...Rafael França2016-03-113-3/+13
|\ \