aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * The BINARY Operator is only needed for string columnsRyuta Kamizono2016-02-223-3/+13
* | Break up a circular require between AP/AVSean Griffin2016-03-114-5/+6
* | Merge pull request #24155 from chrisarcand/clarify-has-many-dependent-optionJon Moss2016-03-111-9/+7
|\ \
| * | Clarify has_many :dependent option docs [ci skip]Chris Arcand2016-03-111-9/+7
* | | Ping the resque version while we can't investigate the failureRafael Mendonça França2016-03-111-1/+1
* | | Use the most highest priority exception handler when cause is setSean Griffin2016-03-113-2/+49
* | | Fix test failures caused by #23958Sean Griffin2016-03-111-1/+1
* | | Merge pull request #22854 from jcoyne/missing_templateSean Griffin2016-03-113-1/+23
|\ \ \
| * | | Render default template if block doesn't renderJustin Coyne2016-02-253-1/+23
* | | | Merge pull request #24150 from exviva/unmarshal-infinite-retryXavier Noria2016-03-113-1/+20
|\ \ \ \
| * | | | Prevent `Marshal.load` from looping infinitelyOlek Janiszewski2016-03-113-1/+20
* | | | | Merge pull request #24143 from perceptec/fix-thread-mattr-accessor-refsMatthew Draper2016-03-122-2/+8
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix `thread_mattr_accessor` thread-local variable namingMichael Ryan2016-03-112-2/+8
| |/ / /
* | | | Merge pull request #24054 from kamipo/extract_default_primary_keyRafael França2016-03-115-22/+22
|\ \ \ \