aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 interpolation
| * Remove redundant `to_s` in interpolationclaudiob2014-10-309-15/+15
| |
* | Merge branch 'master-sec'Aaron Patterson2014-10-302-4/+32
|\ \ | | | | | | | | | | | | * master-sec: FileHandler should not be called for files outside the root
| * | FileHandler should not be called for files outside the rootAaron Patterson2014-10-102-4/+32
| | | | | | | | | | | | | | | FileHandler#matches? should return false for files that are outside the "root" path.
* | | 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
|/ / / | | | | | | | | | It was missing from table, but is present in sample hash below
* | / Use `#between`, rather than `#in` for passing Ranges to ArelSean Griffin2014-10-303-2/+3
| |/ |/| | | | | Passing ranges to `#in` has been deprecated in Arel.
* | Merge pull request #17434 from claudiob/remove-redundant-to-sXavier Noria2014-10-301-2/+2
|\ \ | | | | | | Remove redundant `to_s` in interpolation
| * | Remove redundant `to_s` in interpolationclaudiob2014-10-291-2/+2
| | |
* | | Merge pull request #17308 from pabloh/small_optimizationsJeremy Kemper2014-10-293-3/+3
|\ \ \ | | | | | | | | Faster to call `gsub` with a regexp literal than a string literal
| * | | 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 [ci skip]
| * | | 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
|\ \ \ | | | | | | | | correct GlobalID mixin name in the guides
| * | | correct GlobalID mixin name in the guidesChris Moylan2014-10-291-1/+1
|/ / /
* | | Merge pull request #17431 from hbriggs/upgrade_guide_2.7_2.8Rafael Mendonça França2014-10-291-3/+3
|\ \ \ | | | | | | | | Update 2.7 & 2.8 of upgrading_ruby_on_rails.md [ci skip]
| * | | [ci skip] Fixes typos in section 2.7 "Rails Html Sanitizer", adds content to ↵Hannah Briggs2014-10-291-3/+3
|/ / / | | | | | | | | | section 2.8 "Rails DOM Testing"
* | | Merge pull request #17429 from edwinwills/full-height-email-previewRafael Mendonça França2014-10-291-1/+4
|\ \ \ | | | | | | | | The email preview iframe height is fixed and does not scale to the browser size
| * | | On larger screens the email preview iframe is being limited to a height of ↵Edwin Wills2014-10-291-1/+4
|/ / / | | | | | | | | | 800 pixels, and the full available screen size is not being used.
* | | Merge pull request #17411 from ↵Rafael Mendonça França2014-10-291-1/+1
|\ \ \ | |/ / |/| | | | | | | | mcfiredrill/doc-change-column-default-abstract-mysql-adapter document change_column and change_column_default for abstract_mysql_adapter [ci skip]
| * | :nodoc: for abstract_mysql_adapterTony Miller2014-10-291-1/+1
| | |
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 23:23:46 +0000