aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15078 from nbudin/fix_merger_filter_binds_comparison_masterRafael Mendonça França2014-05-145-1/+32
|\
| * Make filter_binds filter out symbols that are equal to stringsNat Budin2014-05-145-1/+32
* | Merge pull request #14137 from dasch/better-fragment-cache-instrumentationRafael Mendonça França2014-05-143-1/+31
|\ \
| * | Add controller and action name to the instrumentation payloadDaniel Schierbeck2014-05-103-1/+31
* | | Merge pull request #15070 from ayamomiji/sse-patchAaron Patterson2014-05-142-1/+18
|\ \ \
| * | | Add multiple lines message support for SSE moduleayaya2014-05-122-1/+18
* | | | rake, remove frontbase related tasks from Active Record Rakefile.Yves Senn2014-05-141-46/+0
* | | | Merge pull request #15110 from kuldeepaggarwal/fix-warningRafael Mendonça França2014-05-141-1/+1
|\ \ \ \
| * | | | remove warning `ambiguous first argument; put parentheses or even spaces`Kuldeep Aggarwal2014-05-151-1/+1
* | | | | Merge pull request #15074 from kuldeepaggarwal/docs-changesRafael Mendonça França2014-05-141-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ci skip]add updated information, ref[#522c0fd]Kuldeep Aggarwal2014-05-141-0/+2
* | | | | Merge pull request #15108 from arthurnn/i18n_masterRafael Mendonça França2014-05-141-0/+1
|\ \ \ \ \
| * | | | | Use i18n master to run testsArthur Neves2014-05-131-0/+1
* | | | | | Merge pull request #15096 from robin850/patch-20Rafael Mendonça França2014-05-143-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update Redcarpet to 3.1.2Robin Dupret2014-05-143-4/+4
* | | | | | We need an explicit returnRafael Mendonça França2014-05-141-4/+4
* | | | | | Following documentation guidelineRafael Mendonça França2014-05-141-4/+3
* | | | | | Refactoring the code to make consitional return explicitRafael Mendonça França2014-05-141-4/+9
* | | | | | Follow the documentation guidelineRafael Mendonça França2014-05-141-1/+1
* | | | | | Mark _prefix as nodocRafael Mendonça França2014-05-141-3/+2
* | | | | | ._prefix is private API so we should not recommend to override itRafael Mendonça França2014-05-141-2/+2
* | | | | | Improve CHANGELOG entryRafael Mendonça França2014-05-141-2/+4
* | | | | | Merge remote-tracking branch 'apotonick/simplify-prefixes'Rafael Mendonça França2014-05-143-15/+75
|\ \ \ \ \ \
| * | | | | | deprecate AbC:Base::parent_prefixes.Nick Sutterer2014-05-133-4/+69
| * | | | | | simplify AC:ViewPaths::_prefixes. by making it recursively traversing up the ...Nick Sutterer2014-05-131-15/+10
* | | | | | | Merge pull request #14833 from jyao6/attribute_inheritanceMatthew Draper2014-05-143-5/+37
|\ \ \ \ \ \ \
| * | | | | | | Fix inheritance of stored_attributes (fixes #14672)Jessica Yao2014-05-143-5/+37
|/ / / / / / /
* | | | | | | Merge pull request #15102 from azul/patch-1Yves Senn2014-05-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | minor: point to the right test suite locationazul2014-05-141-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #15099 from eileencodes/refactor_delete_records_methodAaron Patterson2014-05-133-16/+20
|\ \ \ \ \ \ \
| * | | | | | | remove count vareileencodes2014-05-131-4/+2
| * | | | | | | rename delete_all_records to delete_or_nullify_all_recordseileencodes2014-05-133-8/+4
| * | | | | | | remove need for :all symboleileencodes2014-05-131-13/+6
| * | | | | | | begin refactoring delete_records methodeileencodes2014-05-133-13/+30
|/ / / / / / /
* | | | | | | Merge pull request #15100 from eileencodes/remove-deprecation-warning-no-long...Godfrey Chan2014-05-132-6/+4
|\ \ \ \ \ \ \
| * | | | | | | remove deprecation warningeileencodes2014-05-132-6/+4
* | | | | | | | _recall should be set to a hash or not setAaron Patterson2014-05-132-4/+4
* | | | | | | | we never call url_for with a block, so rmAaron Patterson2014-05-131-1/+0
|/ / / / / / /
* | | | | | | drop || test for cases that do not need itAaron Patterson2014-05-132-4/+6
* | | | | | | no need to check for presence, script names can be blankAaron Patterson2014-05-131-2/+2
* | | | | | | extend with a module then use define_methodAaron Patterson2014-05-131-7/+4
* | | | | | | this method should always have a parameter passed to it, so remove the defaultAaron Patterson2014-05-131-1/+1
| |/ / / / / |/| | | | |
* | | | | | options should always be passed to url_forAaron Patterson2014-05-131-2/+2
* | | | | | Merge pull request #15092 from kares/pg-array-parserRafael Mendonça França2014-05-132-27/+27
|\ \ \ \ \ \
| * | | | | | [postgres] include PgArrayParser directly and only load/include ArrayParser i...kares2014-05-132-27/+27
* | | | | | | Merge pull request #15095 from JuanitoFatas/doc/generatorsRafael Mendonça França2014-05-131-2/+2
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Fix a factual error and highlight code in generators guide.Juanito Fatas2014-05-141-2/+2
* | | | | | | | Merge pull request #15072 from mjtko/fix/issue-15064Rafael Mendonça França2014-05-133-1/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Require active_support/core_ext/string/output_safety and use html_safe rather...Mark J. Titorenko2014-05-121-1/+2
| * | | | | | | | Use block parameter rather than `$1` during `gsub!` so `ActiveSupport::SafeBu...Mark J. Titorenko2014-05-123-1/+13
| | |_|_|_|/ / / | |/| | | | | |