aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
| * | | | | | | Let `unscope` ignore non Arel scope.where_valuesWashington Luiz2014-01-302-2/+10
| | | | | | | |
* | | | | | | | Merge pull request #13886 from arthurnn/fix_relation_arelRafael Mendonça França2014-01-308-18/+52
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix regression on .select method
| * | | | | | | | Fix regression on `.select_*` methods.Arthur Neves2014-01-308-18/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a common pattern: ``` query = author.posts.select(:title) connection.select_one(query) ``` However `.select` returns a ActiveRecord::AssociationRelation, which has the bind information, so we can use that to get the right sql query. Also fix select_rows on postgress and sqlite3 that were not using the binds [fixes #7538] [fixes #12017] [related #13731] [related #12056]
* | | | | | | | | Merge pull request #13612 from eval/issue-13588Rafael Mendonça França2014-01-304-16/+230
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Add CreateMigration action
| * | | | | | | | Add CreateMigration actionGert Goet2014-01-284-16/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This Thor-action isolates the logic whether to (over-)write migration and what is shown to the user. It's modelled after Thor's CreateFile-action. This solves the issue that removing a non-existing migration, tried to remove the template-path (#13588). Related issues: #12674
* | | | | | | | | fix typo and indent. [ci skip]Yves Senn2014-01-302-2/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #13774 from prathamesh-sonpatki/post-to-articleYves Senn2014-01-3020-407/+429
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Replace Post model with Article model in getting started guide [ci skip]
| * | | | | | | | | Replace Post with Article in getting started guide [ci skip]Prathamesh Sonpatki2014-01-2520-407/+429
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Used Article model instead of Post as it may confuse with 'post' requests - Tried to wrap the guide to 80 chars lines as much as possible. - Removed unused image - Fixes #13764
* | | | | | | | | | Merge pull request #13884 from rafaelfranca/rm-travel-backRafael Mendonça França2014-01-306-14/+58
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add `travel_back` to remove stubs from `travel` and `travel_to` and remove auto-rollback after each test case
| * | | | | | | | | | Improve documentation [ci skip]Rafael Mendonça França2014-01-302-5/+7
| | | | | | | | | | |
| * | | | | | | | | | Remove automatic removal of Date/Time stubs after each test caseRafael Mendonça França2014-01-305-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behavior is only work out-of-box with minitest and also add a downside to run after each test case, even if we don't used the travel or travel_to methods
| * | | | | | | | | | Add `travel_back` to remove stubs from `travel` and `travel_to`Rafael Mendonça França2014-01-304-3/+33
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #13878 from marcandre/leave_my_options_aloneRafael Mendonça França2014-01-302-2/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | find_in_batches should not mutate its argument
| * | | | | | | | | | find_in_batches should not mutate its argumentMarc-Andre Lafortune2014-01-292-2/+8
| | | | | | | | | | |