aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | If Rails is not defined, check ENV["RAILS_ENV"] and ENV["RACK_ENV"].Keith Gable2014-10-212-1/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced by 6cc03675d30b58e28f585720dad14e947a57ff5b. ActiveRecord, if used without Rails, always checks the "default_env" environment. This would be OK, except that Sinatra also supports environments, and it runs with {RACK|RAILS}_ENV=production. This patch adds a fallback to RAILS_ENV and RACK_ENV (and ultimately default_env) if Rails.env doesn't exist.
* | | | | Merge pull request #17462 from vipulnsward/actionmailer-doc-fixRafael Mendonça França2014-10-311-2/+7
|\ \ \ \ \ | | | | | | | | | | | | AM README fixes [ci skip]
| * | | | | - Changed redundant user of `deliver` to `deliver_now`Vipul A M2014-11-011-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Wrapped text in setting defaults section. Also added break, to a sentence. [ci skip]
* | | | | | Use the correct values for int max and minSean Griffin2014-10-313-56/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had accidentally gone one power of two too far. In addition, we need to handle minimum values as well as the maximum.
* | | | | | Tiny documentation improvements [ci skip]Robin Dupret2014-10-313-11/+8
| | | | | |
* | | | | | Merge branch 'tags-public-send'Rafael Mendonça França2014-10-312-1/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14180 Fixes #17461
| * | | | | | Improve test of private properties of objects in form tagsRafael Mendonça França2014-10-311-28/+9
| | | | | | |
| * | | | | | Use public_send for form tagsagius2014-10-311-0/+27
| | | | | | |
| * | | | | | Honor public/private in ActionView::Helpers::Tags::Base#valueTobias Pfeiffer2014-10-312-1/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * use public_send instead of send to avoid calling private methods in form helpers
* | | | | | Merge pull request #17459 from sgrif/sg-find-by-large-numbersSean Griffin2014-10-319-18/+56
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Treat strings greater than int max value as out of range
| * | | | | Treat strings greater than int max value as out of rangeSean Griffin2014-10-319-18/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sufficiently large integers cause `find` and `find_by` to raise `StatementInvalid` instead of `RecordNotFound` or just returning `nil`. Given that we can't cast to `nil` for `Integer` like we would with junk data for other types, we raise a `RangeError` instead, and rescue in places where it would be highly unexpected to get an exception from casting. Fixes #17380
* | | | | | Merge pull request #17460 from hbriggs/masterAbdelkader Boudih2014-10-311-4/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Masked authenticity token section, finder options details, misc typos [ci skip]
| * | | | | Add masked authenticity token section, details on finder options, misc typos ↵Hannah Briggs2014-10-311-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Rename `default_attributes` to `_default_attributes`Sean Griffin2014-10-312-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is internal use only. This is to avoid conflicting with users' method names. Fixes #17458
* | | | | | Don't require calculations to be aliased to a columnSean Griffin2014-10-312-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Arel has changed so that `.sum` no longer aliases `SUM(the_column)` to `sum_id`. This means the type returned by the adapter will be at the key `"SUM(the_column)"`. Longer term, we should eventually be able to retain type information from the AR::Base subclasses used in joined queries
* | | | | | Do not package the guides outputRafael Mendonça França2014-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #17455
* | | | | | Merge pull request #17451 from y-yagi/fix_asi_guideAbdelkader Boudih2014-10-311-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] fix incorrect key in Active Support Instrumentation guide
| * | | | | | [ci skip] fix incorrect key in Active Support Instrumentation guideyuuji.yaginuma2014-10-311-5/+5
|/ / / / / /
* | | | | | 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
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 09:58:05 +0000