aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do gsub with a regexp instead of a stringPablo Herrero2014-10-293-3/+3
|
* Merge pull request #17427 from dwo/masterZachary Scott2014-10-291-1/+1
|\ | | | | better example for tokenizer lambda [ci skip]
| * better example for tokenizer lambda [ci skip]Robin Tweedie2014-10-291-1/+1
|/ | | | | Splitting on whitespace makes more sense in the context of counting words in an essay.
* Merge pull request #17423 from lukefx/jruby_windows_tzinfoSantiago Pastorino2014-10-291-2/+2
|\ | | | | Added 'tzinfo-data' if we are using jruby
| * 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
| | | | | | | | | | | | | | | | | | | | The MySQLAdapter type map used the lowest priority for enum types. This was the result of a recent refactoring and lead to some broken lookups for enums with values that match other types. Like `8bit`. This patch restores the priority to what we had before the refactoring. /cc @sgrif
* | edit pass over all warningsXavier Noria2014-10-2820-38/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uniformizes warning messages. I used the most common style already present in the code base: * Capitalize the first word. * End the message with a full stop. * "Rails 5" instead of "Rails 5.0". * Backticks for method names and inline code. Also, converted a few long strings into the new heredoc convention.
* | 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 warn with heredocs
| * | let's warn with heredocsXavier Noria2014-10-2818-76/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current style for warning messages without newlines uses concatenation of string literals with manual trailing spaces where needed. Heredocs have better readability, and with `squish` we can still produce a single line. This is a similar use case to the one that motivated defining `strip_heredoc`, heredocs are super clean.
* | | đź’ŁSean Griffin2014-10-282-2/+5
| | | | | | | | | | | | We were relying on hash inequality in tests
* | | Implement hash equality on columnSean Griffin2014-10-281-0/+5
| | | | | | | | | | | | | | | | | | The query cache uses bind values as hash keys. The current implementation relies on reference equality for hash equality. This is brittle, and can easily break in the future.
* | | Implement #== for columnSean Griffin2014-10-281-0/+8
| | | | | | | | | | | | We shouldn't rely on reference equality of these objects in tests
* | | Remove unneccessary default values from relation mergerSean Griffin2014-10-281-2/+2
| | | | | | | | | | | | The value methods will default to an empty array for us automatically
* | | Fix uninitialized ivar warning in testsSean Griffin2014-10-281-1/+1
| | |
* | | Call value methods when merging relations, rather than accessing keysSean Griffin2014-10-281-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | The change to accessing keys directly was originally added to allow `merge` to take a hash. The implementation of `HashMerger` no longer requires us to be doing so. Accessing the values directly makes it impossible to change internal storage details, even if shim methods are added temporarily
* | | Merge pull request #17039 from zv1n/add_prefix_delimiterRafael Mendonça França2014-10-283-2/+45
|\ \ \ | |/ / |/| | Added ability to configure the queue_name_prefix delimiter to ActiveJob::QueueName.
| * | Added queue_name_delimiter attribute.Terry Meacham2014-10-263-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | - Added ActiveJob::Base#queue_name_delimiter to allow for developers using ActiveJob to change the delimiter from the default ('_') to whatever else they may be using (e.g., '.', '-', ...). - Updated source guide to include a blurb about the delimiter.
* | | Typos in the deprecation messageGodfrey Chan2014-10-281-2/+2
| | |
* | | Mention only_path deprecation in release notes [ci skip]Godfrey Chan2014-10-281-0/+3
| | |
* | | Deprecate the `only_path` option on `*_path` helpers.Godfrey Chan2014-10-283-2/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cases where this option is set to `true`, the option is redundant and can be safely removed; otherwise, the corresponding `*_url` helper should be used instead. Fixes #17294. See also #17363. [Dan Olson, Godfrey Chan]
* | | Merge pull request #17416 from tricknotes/fix-doc-markupAbdelkader Boudih2014-10-282-10/+10
|\ \ \ | |_|/ |/| | Fix doc markup for `NumberHelper`
| * | Fix doc markup for `NumberHelper` [ci skip]Ryunosuke SATO2014-10-292-10/+10
|/ / | | | | | | | | The character "*" is unnecessary in option candidates. This incorrect markup was injected in e8c9aeca .
* | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 10:44:04 +0000