aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Tiny documentation improvements [ci skip]Robin Dupret2014-10-313-11/+8
* | | | | Merge branch 'tags-public-send'Rafael Mendonça França2014-10-312-1/+15
|\ \ \ \ \
| * | | | | Improve test of private properties of objects in form tagsRafael Mendonça França2014-10-311-28/+9
| * | | | | Use public_send for form tagsagius2014-10-311-0/+27
| * | | | | Honor public/private in ActionView::Helpers::Tags::Base#valueTobias Pfeiffer2014-10-312-1/+7
|/ / / / /
* | | | | Merge pull request #17459 from sgrif/sg-find-by-large-numbersSean Griffin2014-10-319-18/+56
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Treat strings greater than int max value as out of rangeSean Griffin2014-10-319-18/+56
* | | | | Merge pull request #17460 from hbriggs/masterAbdelkader Boudih2014-10-311-4/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add masked authenticity token section, details on finder options, misc typos ...Hannah Briggs2014-10-311-5/+8
* | | | | Rename `default_attributes` to `_default_attributes`Sean Griffin2014-10-312-3/+3
* | | | | Don't require calculations to be aliased to a columnSean Griffin2014-10-312-2/+1
* | | | | Do not package the guides outputRafael Mendonça França2014-10-311-1/+1
* | | | | Merge pull request #17451 from y-yagi/fix_asi_guideAbdelkader Boudih2014-10-311-5/+5
|\ \ \ \ \
| * | | | | [ci skip] fix incorrect key in Active Support Instrumentation guideyuuji.yaginuma2014-10-311-5/+5
|/ / / / /
* | | | | 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