aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #17408 from bf4/fix_rbx_testYves Senn2014-10-281-1/+1
|\ \ \ \ | | | | | | | | | | Fix rbx generated Gemfile regex
| * | | | Fix rbx generated Gemfile regexBenjamin Fleischer2014-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/39190983#L460 1) Failure: AppGeneratorTest#test_psych_gem [test/generators/app_generator_test.rb:495]: Expected /gem 'psych',\s+'~> 2.0', \s+platforms: :rbx/ to match <snip> http://git.io/uuLVag)\ngem 'psych', '~> 2.0', platforms: :rbx\n\n
* | | | | Merge pull request #17310 from pabloh/optimize_strftimeAndrew White2014-10-283-10/+16
|\ \ \ \ \ | |_|_|/ / |/| | | | Optimize TimeWithZoneTest#strftime
| * | | | Optimize TimeWithZoneTest#strftimePablo Herrero2014-10-273-10/+16
| |/ / /
* | | | Merge pull request #16229 from byroot/stop-swallowing-url-generation-errorsAndrew White2014-10-272-1/+16
|\ \ \ \ | | | | | | | | | | UrlGenerationError are not catched as 404 anymore
| * | | | UrlGenerationError are not catched as 404 anymoreJean Boussier2014-10-272-1/+16
| | | | |
* | | | | Merge pull request #17405 from DanOlson/rewhereSean Griffin2014-10-272-1/+22
|\ \ \ \ \ | |_|/ / / |/| | | | Allow Relation#rewhere to work with infinite range values
| * | | | Allow Relation#rewhere to work with infinite range valuesDan Olson2014-10-272-1/+22
|/ / / /
* | | | Merge pull request #17374 from maurogeorge/scope-exceptionYves Senn2014-10-273-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | Raises ArgumentError when try to define a scope without a callable
| * | | | Raises ArgumentError when try to define a scope without a callableMauro George2014-10-232-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the actual exception `NoMethodError: undefined method `call' for #<ActiveRecord::Relation []>` to a `ArgumentError` when try to define a scope without a callable.
* | | | | Merge pull request #14143 from derekprior/dp-compound-index-orderingYves Senn2014-10-275-5/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use type column first in multi-column indexes Conflicts: activerecord/CHANGELOG.md
| * | | | | Use type column first in multi-column indexesDerek Prior2014-10-245-5/+9
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `add_reference` can very helpfully add a multi-column index when you use it to add a polymorphic reference. However, the first column in the index is the `id` column, which is less than ideal. The [PostgreSQL docs][1] say: > A multicolumn B-tree index can be used with query conditions that > involve any subset of the index's columns, but the index is most > efficient when there are constraints on the leading (leftmost) > columns. The [MySQL docs][2] say: > MySQL can use multiple-column indexes for queries that test all the > columns in the index, or queries that test just the first column, the > first two columns, the first three columns, and so on. If you specify > the columns in the right order in the index definition, a single > composite index can speed up several kinds of queries on the same > table. In a polymorphic relationship, the type column is much more likely to be useful as the first column in an index than the id column. That is, I'm more likely to query on type without an id than I am to query on id without a type. [1]: http://www.postgresql.org/docs/9.3/static/indexes-multicolumn.html [2]: http://dev.mysql.com/doc/refman/5.0/en/multiple-column-indexes.html
* | | | | Merge pull request #17362 from bronzle/fix_debug_exceptions_appRafael Mendonça França2014-10-264-26/+76
|\ \ \ \ \ | | | | | | | | | | | | Show the user’s application in the source window and select the correct ...
| * | | | | Show the user’s application in the source window and select the correct ↵Byron Bischoff2014-10-234-26/+76
| | | | | | | | | | | | | | | | | | | | | | | | trace list, closes #17312
* | | | | | Add back --skip-turbolinks and remove --skip-gemsRafael Mendonça França2014-10-263-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the most part of cases --skip-gems option just remove one line in the Gemfile. This is not worth for the complexity it adds. Closes #17196
* | | | | | Merge pull request #17330 from DanOlson/rewhereMatthew Draper2014-10-273-1/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix Relation#rewhere to work with Range values
| * | | | | | Fix Relation.rewhere to work with Range valuesDan Olson2014-10-203-1/+12
| | | | | | |
* | | | | | | Merge pull request #17397 from ↵Rafael Mendonça França2014-10-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/fix-type-boolean-error-msg-ci-skip Fix typo in error message when non-boolean value is assigned to boolean column
| * | | | | | | Fix typo in error message when non-boolean value is assigned to boolean columnPrathamesh Sonpatki2014-10-261-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'rishijain-update_docs_1'Zachary Scott2014-10-262-3/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Making the actionmailer docs more explicit to understand [ci skip]Rishi Jain2014-10-262-3/+6
|/ / / / / /
* | | | | | Prefix internal method with _Rafael Mendonça França2014-10-258-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | This will avoid naming clash with user defined methods
* | | | | | Add CHANGELOG entry for #17064Rafael Mendonça França2014-10-251-0/+6
| | | | | |
* | | | | | Use new hash syntaxRafael Mendonça França2014-10-252-3/+4
| | | | | |
* | | | | | :scissors:Rafael Mendonça França2014-10-252-3/+2
| | | | | |
* | | | | | Merge pull request #17064 from frenkel/fix_select_tag_include_blankRafael Mendonça França2014-10-252-2/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use include_blank value as option label
| * | | | | | Use include_blank value as option labelFrank Groeneveld2014-10-172-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update select_tag to reflect documentation and behave the same as form builder select. If the value of include_blank is not boolean true, use that value as the option label.
* | | | | | | Merge pull request #17392 from ↵Rafael Mendonça França2014-10-251-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/fix-docstring-for-sanitized-helpers-ci-skip Clarify comments about sanitized_allowed_tags
| * | | | | | | Clarify comments about sanitized_allowed_tagsPrathamesh Sonpatki2014-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Clarify that arguments are expected in array format. - Extension of https://github.com/rails/rails/pull/17390. - https://github.com/rails/rails/pull/17390 was targeted against 4-1-stable branch. This commit updates master. - [ci skip]
* | | | | | | | Merge pull request #17391 from prathamesh-sonpatki/fix-oid-description-ci-skipEileen M. Uchitelle2014-10-251-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix description of OID in TypeMapInitializer
| * | | | | | | Fix description of OID in TypeMapInitializerPrathamesh Sonpatki2014-10-251-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | give a better error message for misspelled helpersXavier Noria2014-10-253-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See comment in this patch for the rationale. References #16468
* | | | | | | fixes circularity check in dependenciesXavier Noria2014-10-254-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for circular loading should depend on a stack of files being loaded at the moment, rather than the collection of loaded files. This showed up indirectly in #16468, where a misspelled helper would incorrectly result in a circularity error message. References #16468
* | | | | | | instance_eval is evilAkira Matsuda2014-10-251-1/+1
| | | | | | |
* | | | | | | Reduce object allocationAkira Matsuda2014-10-251-1/+5
| | | | | | |
* | | | | | | Reduce object allocationAkira Matsuda2014-10-251-1/+1
| | | | | | |
* | | | | | | Avoid creating range objects (take II)Akira Matsuda2014-10-251-1/+5
| | | | | | |
* | | | | | | The code was not up-to-dateAkira Matsuda2014-10-251-9/+7
| | | | | | |
* | | | | | | Avoid creating unneeded Hash instance and calling slow Hash#fetchAkira Matsuda2014-10-251-1/+1
| | | | | | |
* | | | | | | Merge pull request #17385 from nakadai/patch-1Zachary Scott2014-10-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix typo in "Active Record Basics" guide. [ci skip]
| * | | | | | | Fix typo in "Active Record Basics" guide. [ci skip]nakadai2014-10-241-1/+1
|/ / / / / / /
* | | | | | | Revert a change made to the example in 1ac4525Godfrey Chan2014-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @carlosantoniodasilva pointed out that when `@person` is nil then this would blow up when you ended up calling `#first`on `nil`. > "there’s no way to break a try chain when you enter it :D" [ci skip]
* | | | | | | Include return value in examples added in #17378 [ci skip]Zachary Scott2014-10-241-2/+2
| | | | | | |
* | | | | | | Improved try documentation [ci skip]Eugene Gilburg2014-10-241-8/+25
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - better `if` example - Added chaining example to the try method description - Documented the `respond_to?` check to the try method description - Clearer wording to explain that argument error is raised on argument mismatch to responding method, rather than to non-responding method (which is handled without exception by `try`) - `.any?` is more precise than `! .blank?` - Don't need to use `try` on `children` as (for regular associations) they will always be a collection or array that responds to `first` - Fix typos/grammar
* | | | | | Merge pull request #17381 from jonatack/patch-8Santiago Pastorino2014-10-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | AR Migrations Guide#Foreign Keys: fix wrong table
| * | | | | | AR Migrations Guide#Foreign Keys: fix wrong tableJon Atack2014-10-241-1/+1
|/ / / / / / | | | | | | | | | | | | [skip ci]
* | | | | | Merge pull request #17377 from aripollak/dry-try-bangGodfrey Chan2014-10-231-10/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | DRY up try/try!
| * | | | | | DRY up try/try!Ari Pollak2014-10-231-10/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #17369 from rails/secure_compareGuillermo Iguaran2014-10-234-14/+33
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Secure compare
| * | | | | Use AS secure_compare for CSRF token comparisonGuillermo Iguaran2014-10-231-2/+2
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 11:19:15 +0000