aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | docs, link MySQL manual for multi column indexes. [ci ckip].Yves Senn2014-02-041-1/+3
| | | | | | | | | | | | Closes #9131.
* | | Merge pull request #13899 from ↵Rafael Mendonça França2014-02-042-1/+11
|\ \ \ | | | | | | | | | | | | | | | | Fortisque/kevin/active_record_HABTM_with_belongs_to destruction errors out on HABTM w/out primary key
| * | | fix HABTM w/out primary key errors on destructionKevin Casey2014-02-022-1/+11
| | | |
* | | | `#to_param` returns `nil` if `to_key` returns `nil`. Closes #11399.Yves Senn2014-02-043-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation of `#to_key` (http://api.rubyonrails.org/classes/ActiveModel/Conversion.html#method-i-to_key) states that it returns `nil` if there are no key attributes. `to_param` needs to be aware of that fact and return `nil` as well. Previously it raised the following exception: ``` 1) Error: ConversionTest#test_to_param_returns_nil_if_to_key_is_nil: NoMethodError: undefined method `join' for nil:NilClass /Users/senny/Projects/rails/activemodel/lib/active_model/conversion.rb:65:in `to_param' /Users/senny/Projects/rails/activemodel/test/cases/conversion_test.rb:34:in `block in <class:ConversionTest>' ```
* | | | Merge pull request #13936 from edogawaconan/fix_docsGuillermo Iguaran2014-02-031-1/+1
|\ \ \ \ | |_|/ / |/| | | Missing closing parenthesis. [ci skip]
| * | | Missing closing parenthesis.edogawaconan2014-02-041-1/+1
|/ / /
* | | Merge pull request #11770 from timruffles/doc_ajax_xhrYves Senn2014-02-031-2/+5
|\ \ \ | | | | | | | | be more specific about csrf token and ajax - not whitelisted outside of jquery-rails [ci skip]
| * | | be more specific about csrf token and ajax - not whitelisted outside of ↵Tim Ruffles2013-08-061-2/+5
| | | | | | | | | | | | | | | | jquery-rails [ci skip]
* | | | docs, be clear that `options` is a hash. Closes #11904. [ci skip].Yves Senn2014-02-031-1/+1
| | | |
* | | | some wording format changes. [ci skip]Yves Senn2014-02-032-6/+6
| | | |
* | | | pass `habtm :autosave` to underlying `hm:t` association. Closes #13923.Yves Senn2014-02-034-8/+35
| | | |
* | | | docs, revisit polymorphic associations with STI example. [ci skip]Yves Senn2014-02-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | This is a follow up to #13926. /cc @fxn
* | | | docs, reference to ruby-lang.org. refs #13492. [ci skip]Yves Senn2014-02-031-4/+8
| | | |
* | | | `rails_guides/helpers.rb` requires `YAML` to run.Yves Senn2014-02-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve the following error when running `bundle exec rake guides:generate:html`: ``` /Users/senny/.rbenv/versions/2.0.0-p353/bin/ruby rails_guides.rb Generating 2_2_release_notes.md as 2_2_release_notes.html /Users/senny/Projects/rails/guides/rails_guides/helpers.rb:17:in `documents_by_section': uninitialized constant RailsGuides::Helpers::YAML (ActionView::Template::Error) from /Users/senny/Projects/rails/guides/rails_guides/helpers.rb:32:in `docs_for_menu' from /Users/senny/Projects/rails/guides/source/layout.html.erb:56:in `block in ___sers_senny__rojects_rails_guides_source_layout_html_erb___3094858039481335962_70118647133480' from /Users/senny/Projects/rails/guides/source/layout.html.erb:54:in `each' from /Users/senny/Projects/rails/guides/source/layout.html.erb:54:in `___sers_senny__rojects_rails_guides_source_layout_html_erb___3094858039481335962_70118647133480' from /Users/senny/Projects/rails/actionview/lib/action_view/template.rb:143:in `block in render' from /Users/senny/Projects/rails/activesupport/lib/active_support/notifications.rb:161:in `instrument' from /Users/senny/Projects/rails/actionview/lib/action_view/template.rb:337:in `instrument' from /Users/senny/Projects/rails/actionview/lib/action_view/template.rb:141:in `render' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/template_renderer.rb:61:in `render_with_layout' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/template_renderer.rb:47:in `render_template' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/template_renderer.rb:17:in `render' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/renderer.rb:42:in `render_template' from /Users/senny/Projects/rails/actionview/lib/action_view/renderer/renderer.rb:23:in `render' from /Users/senny/Projects/rails/actionview/lib/action_view/helpers/rendering_helper.rb:24:in `render' from /Users/senny/Projects/rails/guides/rails_guides/markdown.rb:160:in `render_page' from /Users/senny/Projects/rails/guides/rails_guides/markdown.rb:25:in `render' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:205:in `block in generate_guide' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:195:in `open' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:195:in `generate_guide' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:144:in `block in generate_guides' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:142:in `each' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:142:in `generate_guides' from /Users/senny/Projects/rails/guides/rails_guides/generator.rb:97:in `generate' from rails_guides.rb:63:in `<main>' rake aborted! Command failed with status (1): [/Users/senny/.rbenv/versions/2.0.0-p353/bi...] /Users/senny/Projects/rails/guides/Rakefile:11:in `block (3 levels) in <top (required)>' Tasks: TOP => guides:generate:html (See full trace by running task with --trace) ```
* | | | Merge pull request #13930 from calvintam/masterArun Agrawal2014-02-031-1/+1
|\ \ \ \ | | | | | | | | | | Fixed minor typo [ci skip]
| * | | | Fixed minor typo [ci skip]Calvin Tam2014-02-031-1/+1
|/ / / /
* | | | Merge pull request #13926 from fredwu/doc_polymorphic_sti_var_name_typoYves Senn2014-02-021-2/+2
|\ \ \ \ | | | | | | | | | | Fixes the camelCase variable name in the docs [ci skip]
| * | | | Fixes the camelCase variable name in the docs [ci skip]Fred Wu2014-02-031-2/+2
|/ / / /
* | | | Merge pull request #13924 from adomokos/adding_path_examples_to_button_to_testsRafael Mendonça França2014-02-022-0/+12
|\ \ \ \ | | | | | | | | | | Adding a documentation example and a test to button_to with path
| * | | | Adding an documentation example and a test to button_to with pathAttila Domokos2014-02-022-0/+12
|/ / / / | | | | | | | | I did not see in the docs that `button_to` supports not only URLs but paths as well. I documented this functionality with a unit tests and added an example to the docs as well.
* | | | Assert the file is deprecatedRafael Mendonça França2014-02-011-1/+1
| | | |
* | | | Fix isolated testsRafael Mendonça França2014-02-011-0/+1
| | | |
* | | | Merge pull request #13911 from davidcelis/remove-bigdecimal-serializationRafael Mendonça França2014-02-015-28/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate custom BigDecimal serialization Conflicts: activesupport/CHANGELOG.md
| * | | | Remove BigDecimal#to_dDavid Celis2014-02-012-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was backported for Ruby 1.8 support and is no longer needed. Signed-off-by: David Celis <me@davidcel.is>
| * | | | Don't require BigDecimal serialization extensionDavid Celis2014-02-015-16/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails currently provides an extension to BigDecimal that redefines how it is serialized to YAML. However, as noted in #12467, this does not work as expected. When ActiveSupport is required, BigDecimal YAML serialization does not maintain the object type. It instead ends up serializing the number represented by the BigDecimal itself which, when loaded by YAML later, becomes a Float: ```ruby require 'yaml' require 'bigdecimal' yaml = BigDecimal('13.37').to_yaml YAML.load(yaml).class require 'active_support/all' yaml = BigDecimal('13.37').to_yaml YAML.load(yaml).class ``` @tenderlove posits that we should deprecate the custom BigDecimal serialization and let Ruby handle it. For the time being, users who require this serialization for backwards compatibility can manually `require 'active_support/core_ext/big_decimal/yaml_conversions'`. This will close #12467 and deprecate the custom BigDecimal#to_yaml. Signed-off-by: David Celis <me@davidcel.is>
* | | | | Remove warnings for already defined methodsRafael Mendonça França2014-02-011-1/+3
| | | | |
* | | | | Make arel methods private APIRafael Mendonça França2014-02-012-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since its conception arel was made to be private API of Active Record. If users want to use arel features directly we should provide a way using the Active Record API without exposing the arel implementation.
* | | | | Merge pull request #13688 from jbaudanza/psql-index-existsRafael Mendonça França2014-02-013-0/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PostgreSQL implementation of SchemaStatements#index_name_exists? Conflicts: activerecord/CHANGELOG.md
| * | | | | psql implementation of #index_name_exists?Jonathan Baudanza2014-01-163-0/+35
| | | | | |
* | | | | | Merge pull request #13863 from joshjordan/jsj-dont-throw-out-get-paramsRafael Mendonça França2014-02-013-4/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not discard query parameters on requests that use wrap_parameters Conflicts: actionpack/CHANGELOG.md
| * | | | | | Do not discard query parameters on requests that use wrap_parametersJosh Jordan2014-01-303-4/+36
| | | | | | |
* | | | | | | Merge pull request #13912 from mauricio/bug-13907Rafael Mendonça França2014-02-013-2/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixes issue with parsing whitespace content back from database - fixes #13907
| * | | | | | | Fixes issue with parsing whitespace content back from database - fixes #13907Mauricio Linhares2014-02-013-2/+26
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #12769 from birkirb/masterRafael Mendonça França2014-02-013-2/+135
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Boolean parser blows up on a Fixnum. Conflicts: activesupport/CHANGELOG.md
| * | | | | | Fix breakage in XmlMiniBirkir A. Barkarson2013-12-233-2/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Boolean parsing breaks on non strings (i.e. integer 1|0) - Symbol parsing breaks on non strings. - BigDecimal parsing breaks due to missing require. - Update changelog.
* | | | | | | this class depends on JoinHelper, so we should require itAaron Patterson2014-01-311-0/+2
| | | | | | |
* | | | | | | just require the template resolverAaron Patterson2014-01-312-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LookupContext is eagerly loaded, and FallbackFileSystemResolver is referenced at the class level. Just require the resolver from the eagerly loaded class rather than jumping through autoload hoops
* | | | | | | only ask for the location filters onceAaron Patterson2014-01-312-6/+7
| | | | | | |
* | | | | | | FilterRedirect is referenced at the class level from the ResponseAaron Patterson2014-01-312-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can just require the file rather than going through the autoload indirection
* | | | | | | Maintain the current timezone in wrap_with_time_zoneAndrew White2014-01-313-7/+16
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the solution from the fix for #12163 to the general case where `Time` methods are wrapped with a time zone. Fixes #12596.
* | | | | | Merge pull request #13780 from rohitpaulk/patch-1Rafael Mendonça França2014-01-311-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updated association_basics.md
| * | | | | | Updated association_basics.md [ci skip]Rohit Paul Kuruvilla2014-01-311-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated association_basics.md to include how to write migrations for self joins Update association_basics.md Corrected the update Update association_basics.md Typo fix Changed :employee to :manager
* | | | | | | Minor changelog improvements [ci skip]Carlos Antonio da Silva2014-01-312-5/+5
| | | | | | |
* | | | | | | Merge pull request #13900 from zzak/issue_12963Carlos Antonio da Silva2014-01-311-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Document default trim mode for Erubis and affected ERB tags. Fixes #12963 [ci skip]
| * | | | | | | Document default trim mode for Erubis and affected ERB tags [ci skip]Zachary Scott2014-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #12963
* | | | | | | | Merge pull request #13896 from laurocaetano/dangerous_association_namesCarlos Antonio da Silva2014-01-315-0/+52
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Associations now raises `ArgumentError` on name conflicts. Closes #13217.
| * | | | | | | Associations now raise `ArgumentError` on name conflicts.Lauro Caetano2014-01-315-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dangerous association names conflicts include instance or class methods already defined by `ActiveRecord::Base`.
* | | | | | | | Merge pull request #13898 from timfenney/my_branchGodfrey Chan2014-01-301-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Remove unused variable.
| * | | | | | | Remove unused variable.Tim Fenney2014-01-311-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #13859 from huoxito/let-it-goRafael Mendonça França2014-01-302-2/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Let `unscope` ignore non Arel scope.where_values
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 03:37:43 +0000