aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Typo fix [ci skip]amitkumarsuroliya2015-09-071-1/+1
| | | `lengh` should be `length`
* Merge pull request #20534 from qnm/activesupport-require-issueYves Senn2015-09-071-0/+1
|\ | | | | Add require to ensure Time#advance works without implicit required
| * Remove accidental ruby-versionRob Sharp2015-06-121-1/+0
| |
| * Add missing require to ensure #advance will work without being implicity ↵Rob Sharp2015-06-122-0/+2
| | | | | | | | required
* | Merge pull request #21527 from rngtng/fix-migrator-path-setupYves Senn2015-09-073-2/+10
|\ \ | | | | | | | | | Use global migrations_path configuration in Migrator
| * | Allow global migrations_path configuration with using value from ↵Tobias Bielohlawek2015-09-073-2/+15
|/ / | | | | | | database_tasks instead of Migrator
* | 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`
| * | 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 cases
| * | 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]
| * | | 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 desc
| * | | | [ci skip] Replace `AR` with `Active Record` in task descyui-knk2015-09-071-1/+1
|/ / / / | | | | | | | | | | | | | | | | Many user look `desc` of rake task and they are not familiar with `AR`. `Active Record` is more familiar word.
* | | | Fix test failures from premature merge of #21317Matthew Draper2015-09-072-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently I managed to forget how similar the "tests passing" and "no status reported" merge indicators look. Note that the previous `stubs` in test_add_index wasn't working: the method was still called, and just happened to return false.
* | | | Merge pull request #21317 from ↵Matthew Draper2015-09-076-9/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | greysteil/support-postgres-drop-index-concurrently Support dropping indexes concurrently in Postgres
| * | | | Support dropping indexes concurrently in PostgresGrey Baker2015-09-056-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | See http://www.postgresql.org/docs/9.4/static/sql-dropindex.html for more details.
* | | | | Merge pull request #21505 from ↵Matthew Draper2015-09-075-15/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | morgoth/deprecate-passing-conditions-to-destroy_all-and-delete_all Deprecate passing conditions to AR::Relation destroy_all and delete_all methods
| * | | | | 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]
| * | | | | 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
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | `hfvalue` parts should always be percent encoded, so lets do that! Revert "use path escaping for email addresses" This reverts commit 21ffef38a5dc5a6a21f7e841aecab5b51f4fd185.
* | | | Merge pull request #21506 from rodzyn/remove_mocha_part_3Kasper Timm Hansen2015-09-058-90/+132
|\ \ \ \ | |/ / / |/| | | Remove mocha from ActionPack tests
| * | | Remove mocha from ActionPack testsMarcin Olichwirowicz2015-09-058-90/+132
|/ / /
* | | implement abstract store methodsAaron Patterson2015-09-044-8/+8
| | | | | | | | | | | | converts old ID methods to the new abstract store methods in Rack
* | | stop using deprecated Abstract::ID classAaron Patterson2015-09-045-5/+5
| | |
* | | stop inheriting from Rack::RequestAaron Patterson2015-09-0412-22/+24
| | | | | | | | | | | | | | | | | | Just include the modules necessary in the Request object to implement the things we need. This should make it easier to build delegate request objects because the API is smaller
* | | Merge pull request #21504 from ioquatix/patch-1Sean Griffin2015-09-041-1/+1
|\ \ \ | | | | | | | | #where fails if opts.responds_to?(:==) unexpectedly
| * | | #where fails if opts.responds_to?(:==) unexpectedlySamuel Williams2015-09-051-1/+1
|/ / / | | | | | | Sometimes opts passed in might respond to ==, e.g. `Arel::Nodes::Grouping`. In this case, `opts == :chain` returns `Arel::Nodes::Equality` which causes odd behaviour. Prefer `if :chain == opts` which guarantees that `Symbol#==` would be invoked. Alternatively consider `eql?`.
* | | use path escaping for email addressesAaron Patterson2015-09-042-4/+4
| | | | | | | | | | | | | | | | | | Due to e25fdad2f147e6f368958f9a06a5ac9d10288408, we are correctly using path escaping for email addresses. This commit fixes the tests to expect path escaping.
* | | use `Rack::Utils.unescape_path` to unescape pathsAaron Patterson2015-09-042-4/+4
| | | | | | | | | | | | | | | | | | Escaping and unescaping paths is different than query parameters, and we need to respect that. This commit uses the new method in Rack to escape and unescape paths. Fixes #11816
* | | Merge pull request #21412 from yui-knk/feature/irreversible_migration_error_msgYves Senn2015-09-042-2/+77
|\ \ \ | | | | | | | | | | | | Add detailed error message to `IrreversibleMigration`
| * | | Revert mistakenly added Gemfile.lockyui-knk2015-09-031-4/+0
| | | |
| * | | Add detailed error message to `IrreversibleMigration`yui-knk2015-08-301-1/+6
| | | |
| * | | [ci skip] Add comments for `IrreversibleMigration`yui-knk2015-08-291-0/+70
| | | |
| * | | Add detailed error message to `IrreversibleMigration`yui-knk2015-08-282-1/+5
| | | |
| * | | Add detailed error message to `IrreversibleMigration`yui-knk2015-08-281-1/+1
| | | |
* | | | Merge pull request #21492 from y-yagi/fix_module_name_typo_in_api_app_guideKasper Timm Hansen2015-09-041-1/+1
|\ \ \ \ | | | | | | | | | | fix module name typo in API app guide [ci skip]
| * | | | fix module name typo in API app guide [ci skip]yuuji.yaginuma2015-09-041-1/+1
|/ / / /
* | | | Merge pull request #21435 from justanshulsharma/unicode-versionCarlos Antonio da Silva2015-09-033-1/+5
|\ \ \ \ | | | | | | | | | | Update Unicode Version to 8.0.0
| * | | | Update Unicode Version to 8.0.0Anshul Sharma2015-09-043-1/+5
|/ / / /
* | | | Merge pull request #21473 from akihiro17/remove-unused-requireCarlos Antonio da Silva2015-09-031-1/+0
|\ \ \ \ | | | | | | | | | | Remove unnecessary require in associations_test.rb
| * | | | Remove unnecessary require in associations_test.rbakihiro172015-09-031-1/+0
| | | | |
* | | | | Merge pull request #21481 from prakashlaxkar/remove_configCarlos Antonio da Silva2015-09-032-4/+0
|\ \ \ \ \ | | | | | | | | | | | | Removed unused config from activemodel test
| * | | | | Removed unused config filePrakash Laxkar2015-09-032-4/+0
| | |_|/ / | |/| | |
* | | | | Merge pull request #21483 from justanshulsharma/add-ip6-addressEileen M. Uchitelle2015-09-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | [ci skip] Added localhost IPv6
| * | | | [ci skip] Added localhost IPv6Anshul Sharma2015-09-031-1/+1
| | | | |
* | | | | Merge pull request #21475 from y-yagi/add_description_of_return_valueGodfrey Chan2015-09-021-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | add a description of the return value that was missing [ci skip]
| * | | | add a description of the return value that was missing [ci skip]yuuji.yaginuma2015-09-031-1/+1
|/ / / /