aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove redundant require of fileAdam892014-11-011-1/+0
* Merge pull request #17474 from kuldeepaggarwal/fix-indentaionRafael Mendonça França2014-11-011-1/+1
|\
| * add missing space.[ci skip]Kuldeep Aggarwal2014-11-011-1/+1
|/
* Merge pull request #17470 from keikun17/masterZachary Scott2014-10-311-2/+1
|\
| * Fix break on generated htmlCakey | Buddy Magsipoc2014-11-011-2/+1
|/
* remove unused and untested APIAaron Patterson2014-10-311-6/+2
* fix set_pk_sequence and add a test for it.Aaron Patterson2014-10-312-1/+9
* Added region sequencing of primary keys for Postgres.Joe Rafaniello2014-10-311-0/+21
* Don't attempt to load the schema file in tests if none existsSean Griffin2014-10-312-3/+18
* Don't modify the columns hash to set defaults from the attributes APISean Griffin2014-10-313-14/+39
* Load test schema even if there are no migrationsSean Griffin2014-10-312-1/+18
* Merge pull request #17040 from clyfe/patch-1Rafael Mendonça França2014-10-311-2/+4
|\
| * Explicit route test classClaudius Nicolae2014-09-241-2/+4
* | Merge pull request #17305 from ziggythehamster/activerecord-connectionhandlin...Rafael Mendonça França2014-10-312-1/+90
|\ \
| * | If Rails is not defined, check ENV["RAILS_ENV"] and ENV["RACK_ENV"].Keith Gable2014-10-212-1/+90
* | | Merge pull request #17462 from vipulnsward/actionmailer-doc-fixRafael Mendonça França2014-10-311-2/+7
|\ \ \
| * | | - Changed redundant user of `deliver` to `deliver_now`Vipul A M2014-11-011-2/+7
* | | | Use the correct values for int max and minSean Griffin2014-10-313-56/+119
* | | | 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
|\ \ \ \ \ \