aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #21537 from tgxworld/perf_reduce_allocationRafael Mendonça França2015-09-071-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Reduce allocation in `resolve_column_aliases`.Guo Xiang Tan2015-09-081-5/+5
* | | | | | | | Merge pull request #21520 from jeremy/friendlier-force-sslJeremy Daer (Kemper)2015-09-073-200/+252
|\ \ \ \ \ \ \ \
| * | | | | | | | Make `config.force_ssl` less dangerous to try and easier to disableJeremy Daer2015-09-073-200/+252
* | | | | | | | | Merge pull request #21536 from jeremy/support-mysql2-0.4.0Jeremy Daer (Kemper)2015-09-073-4/+9
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Support mysql2 0.4.0, first release with prepared statements supportJeremy Daer2015-09-073-4/+9
|/ / / / / / / /
* | | | | | / / .gitignore: Ignore .ruby-version in any subdirJeremy Daer2015-09-071-3/+3
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Use Hash[] instead of Hash#dup in resolve_column_aliasesRafael Mendonça França2015-09-071-1/+3
* | | | | | | Merge pull request #21534 from Vratislav/clarify-custom-config-guideRafael Mendonça França2015-09-071-1/+1
* | | | | | | Revert "Merge pull request #21069 from dmitry/feature/validate-multiple-conte...Rafael Mendonça França2015-09-075-50/+2
* | | | | | | Merge pull request #21069 from dmitry/feature/validate-multiple-contexts-at-onceRafael Mendonça França2015-09-075-2/+50
|\ \ \ \ \ \ \
| * | | | | | | Validate multiple contexts on `valid?` and `invalid?` at once.Dmitry Polushkin2015-07-305-2/+50
* | | | | | | | Merge pull request #21522 from tgxworld/scope_perfRafael Mendonça França2015-09-074-5/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Cache check if `default_scope` has been overridden.Guo Xiang Tan2015-09-071-1/+8
| * | | | | | | | Reduce calls to stringify_keys.Guo Xiang Tan2015-09-073-4/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Correct query for PostgreSQL 8.2Matthew Draper2015-09-082-1/+5
* | | | | | | | Merge pull request #21523 from tgxworld/improve_perf_allRafael Mendonça França2015-09-071-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | PERF: Don't create a Relation when it is not needed.Guo Xiang Tan2015-09-071-1/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #21531 from amitsuroliya/typo_fix1Arun Agrawal2015-09-071-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Typo fix [ci skip]amitkumarsuroliya2015-09-071-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #20534 from qnm/activesupport-require-issueYves Senn2015-09-071-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove accidental ruby-versionRob Sharp2015-06-121-1/+0
| * | | | | | | | Add missing require to ensure #advance will work without being implicity requ...Rob Sharp2015-06-122-0/+2
* | | | | | | | | Merge pull request #21527 from rngtng/fix-migrator-path-setupYves Senn2015-09-073-2/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow global migrations_path configuration with using value from database_tas...Tobias Bielohlawek2015-09-073-2/+15
|/ / / / / / / / /
* | | | | | | | | changelog, minor formatting changes.Yves Senn2015-09-071-9/+9
* | | | | | | | | Merge pull request #21524 from gfx/do_not_localize_for_to_sentenceAkira Matsuda2015-09-071-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix strange messages for `rails g foo`FUJI Goro (gfx)2015-09-071-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #21250 from ronakjangir47/safe_constYves Senn2015-09-071-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | safe_constantize - Added Object scoped missing test casesRonak Jangir2015-09-061-0/+2
* | | | | | | | | | Merge pull request #21480 from amitsuroliya/add_return_value_descriptionKasper Timm Hansen2015-09-071-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | adding description of return value [ci skip]amitkumarsuroliya2015-09-031-1/+1
* | | | | | | | | | | Merge pull request #21521 from yui-knk/fix/ar_task_descRichard Schneeman2015-09-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | [ci skip] Replace `AR` with `Active Record` in task descyui-knk2015-09-071-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Fix test failures from premature merge of #21317Matthew Draper2015-09-072-5/+16
* | | | | | | | | | Merge pull request #21317 from greysteil/support-postgres-drop-index-concurre...Matthew Draper2015-09-076-9/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Support dropping indexes concurrently in PostgresGrey Baker2015-09-056-9/+30
* | | | | | | | | | | Merge pull request #21505 from morgoth/deprecate-passing-conditions-to-destro...Matthew Draper2015-09-075-15/+29
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Deprecate passing conditions to AR::Relation destroy_all and delete_all methodsWojciech Wnętrzak2015-09-065-15/+29
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #21514 from ronakjangir47/remove_extra_theXavier Noria2015-09-062-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Removed Extra ‘the’ [ci skip]Ronak Jangir2015-09-062-2/+2
| | |_|/ / / / / / | |/| | | | | | |
* / | | | | | | | Use ERB::Utils to percent encode `hfvalue` parts of mailtoAaron Patterson2015-09-052-5/+5
|/ / / / / / / /
* | | | | | | | Merge pull request #21506 from rodzyn/remove_mocha_part_3Kasper Timm Hansen2015-09-058-90/+132
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove mocha from ActionPack testsMarcin Olichwirowicz2015-09-058-90/+132
|/ / / / / / /
* | | | | | | implement abstract store methodsAaron Patterson2015-09-044-8/+8
* | | | | | | stop using deprecated Abstract::ID classAaron Patterson2015-09-045-5/+5
* | | | | | | stop inheriting from Rack::RequestAaron Patterson2015-09-0412-22/+24
* | | | | | | Merge pull request #21504 from ioquatix/patch-1Sean Griffin2015-09-041-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | #where fails if opts.responds_to?(:==) unexpectedlySamuel Williams2015-09-051-1/+1
|/ / / / / /
* | | | | | use path escaping for email addressesAaron Patterson2015-09-042-4/+4