aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Prepare for 4.2.0.beta4 releaseGodfrey Chan2014-10-3010-10/+10
* Use released arelGodfrey Chan2014-10-302-2/+2
* Merge pull request #17440 from claudiob/remove-yet-another-redundant-to-sXavier Noria2014-10-309-15/+15
|\
| * Remove redundant `to_s` in interpolationclaudiob2014-10-309-15/+15
* | Merge branch 'master-sec'Aaron Patterson2014-10-302-4/+32
|\ \
| * | FileHandler should not be called for files outside the rootAaron Patterson2014-10-102-4/+32
* | | Add status code to AS::Instrumentation table, like #17441 [ci skip]Zachary Scott2014-10-301-0/+1
* | | Merge branch 'strzalek-asn-docs-fix'Zachary Scott2014-10-301-0/+1
|\ \ \
| * | | Add :db_runtime to table [ci skip]Łukasz Strzałkowski2014-10-301-0/+1
|/ / /
* | / Use `#between`, rather than `#in` for passing Ranges to ArelSean Griffin2014-10-303-2/+3
| |/ |/|
* | Merge pull request #17434 from claudiob/remove-redundant-to-sXavier Noria2014-10-301-2/+2
|\ \
| * | Remove redundant `to_s` in interpolationclaudiob2014-10-291-2/+2
* | | Merge pull request #17308 from pabloh/small_optimizationsJeremy Kemper2014-10-293-3/+3
|\ \ \
| * | | Do gsub with a regexp instead of a stringPablo Herrero2014-10-293-3/+3
* | | | add bigserial pk supportAaron Patterson2014-10-293-0/+23
* | | | Merge pull request #17433 from pabloh/fix_typoRafael Mendonça França2014-10-291-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix typo at form_helper docs [ci skip]Pablo Herrero2014-10-291-2/+2
|/ / /
* | | Merge pull request #17432 from cmoylan/update-active-job-guideRafael Mendonça França2014-10-291-1/+1
|\ \ \
| * | | correct GlobalID mixin name in the guidesChris Moylan2014-10-291-1/+1
|/ / /
* | | Merge pull request #17431 from hbriggs/upgrade_guide_2.7_2.8Rafael Mendonça França2014-10-291-3/+3
|\ \ \
| * | | [ci skip] Fixes typos in section 2.7 "Rails Html Sanitizer", adds content to ...Hannah Briggs2014-10-291-3/+3
|/ / /
* | | Merge pull request #17429 from edwinwills/full-height-email-previewRafael Mendonça França2014-10-291-1/+4
|\ \ \
| * | | On larger screens the email preview iframe is being limited to a height of 80...Edwin Wills2014-10-291-1/+4
|/ / /
* | | Merge pull request #17411 from mcfiredrill/doc-change-column-default-abstract...Rafael Mendonça França2014-10-291-1/+1
|\ \ \ | |/ / |/| |
| * | :nodoc: for abstract_mysql_adapterTony Miller2014-10-291-1/+1
* | | Merge pull request #17427 from dwo/masterZachary Scott2014-10-291-1/+1
|\ \ \
| * | | better example for tokenizer lambda [ci skip]Robin Tweedie2014-10-291-1/+1
|/ / /
* | | Merge pull request #17423 from lukefx/jruby_windows_tzinfoSantiago Pastorino2014-10-291-2/+2
|\ \ \
| * | | Added 'tzinfo-data' if we are using jrubyLuca Simone2014-10-291-2/+2
* | | | fix MySQL enum type lookup with values matching another type. Closes #17402.Yves Senn2014-10-293-6/+17
* | | | edit pass over all warningsXavier Noria2014-10-2820-38/+65
* | | | Add mysql and pg specific attributes to Column#== and hashSean Griffin2014-10-282-2/+20
* | | | Merge pull request #17421 from rails/warn-with-heredocXavier Noria2014-10-2818-76/+149
|\ \ \ \
| * | | | let's warn with heredocsXavier Noria2014-10-2818-76/+149
* | | | | 💣Sean Griffin2014-10-282-2/+5
* | | | | Implement hash equality on columnSean Griffin2014-10-281-0/+5
* | | | | Implement #== for columnSean Griffin2014-10-281-0/+8
* | | | | Remove unneccessary default values from relation mergerSean Griffin2014-10-281-2/+2
* | | | | Fix uninitialized ivar warning in testsSean Griffin2014-10-281-1/+1
* | | | | Call value methods when merging relations, rather than accessing keysSean Griffin2014-10-281-14/+14
* | | | | Merge pull request #17039 from zv1n/add_prefix_delimiterRafael Mendonça França2014-10-283-2/+45
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added queue_name_delimiter attribute.Terry Meacham2014-10-263-2/+45
* | | | | Typos in the deprecation messageGodfrey Chan2014-10-281-2/+2
* | | | | Mention only_path deprecation in release notes [ci skip]Godfrey Chan2014-10-281-0/+3
* | | | | Deprecate the `only_path` option on `*_path` helpers.Godfrey Chan2014-10-283-2/+116
* | | | | Merge pull request #17416 from tricknotes/fix-doc-markupAbdelkader Boudih2014-10-282-10/+10
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix doc markup for `NumberHelper` [ci skip]Ryunosuke SATO2014-10-292-10/+10
|/ / / /
* | | | Merge pull request #17408 from bf4/fix_rbx_testYves Senn2014-10-281-1/+1
|\ \ \ \
| * | | | Fix rbx generated Gemfile regexBenjamin Fleischer2014-10-271-1/+1
* | | | | Merge pull request #17310 from pabloh/optimize_strftimeAndrew White2014-10-283-10/+16
|\ \ \ \ \ | |_|_|/ / |/| | | |