aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | |
* | | | | | | | tidy CHANGELOGs [ci skip]Yves Senn2014-01-305-18/+25
| | | | | | | |
* | | | | | | | docs, `references` is only used with `includes`. Closes #13727.Yves Senn2014-01-301-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no gain in `referencing` tables that are not used for preloading. Furthermore it will break if polymorphic associations are invloved. This is because `references_eager_loaded_tables?` uses all `reference_values` to decide wether to `eager_load` or `preload`.
* | | | | | | | Merge pull request #13888 from rails/session-serializerGodfrey Chan2014-01-306-32/+23
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Modify the session serializer implementation
| * | | | | | | Modify the session serializer implementationGuillermo Iguaran2014-01-306-32/+23
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename allowed options to :marshal and :json, for custom serializers only allow the use of custom classes.
* | | | | | | Merge pull request #13883 from rafaelfranca/rm-time-travelRafael Mendonça França2014-01-291-4/+53
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Alternative implementation to make time travel not dependent on mocha
| * | | | | | | Use each_valueRafael Mendonça França2014-01-291-1/+1
| | | | | | | |
| * | | | | | | Store the singleton_class in a local variableRafael Mendonça França2014-01-291-3/+4
| | | | | | | |
| * | | | | | | Change the class and method visibilityRafael Mendonça França2014-01-291-9/+13
| | | | | | | |
| * | | | | | | Use instance method instead of before hookRafael Mendonça França2014-01-291-9/+8
| | | | | | | |
| * | | | | | | Alias the original method first to avoid warningsRafael Mendonça França2014-01-291-2/+7
| | | | | | | |
| * | | | | | | Implement a simple stub feature to use in the Time travel helpersRafael Mendonça França2014-01-291-4/+44
|/ / / / / / /
* | | | | | | Merge pull request #13879 from ↵Rafael Mendonça França2014-01-291-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | schneems/schneems/more-explicit-database-config-error Enhance errors while retrieving database config
| * | | | | | | Enhance errors while retrieving database configschneems2014-01-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now if there is an error retrieving database configuration the intent of the error (what the code was trying to do while you got the error) could be more explicit. Instead of this error: ``` Invalid DATABASE_URL: nil (erb):9:in `rescue in <main>' (erb):6:in `<main>' /Users/schneems/.rbenv/versions/2.1.0/lib/ruby/2.1.0/erb.rb:850:in `eval' /Users/schneems/.rbenv/versions/2.1.0/lib/ruby/2.1.0/erb.rb:850:in `result' /Users/schneems/Documents/projects/rails/railties/lib/rails/application/configuration.rb:98:in `database_configuration' /Users/schneems/Documents/projects/rails/activerecord/lib/active_record/railtie.rb:41:in `block in <class:Railtie>' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `instance_exec' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `block in run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `each' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/application.rb:339:in `block in run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/engine/railties.rb:13:in `each' ``` I propose we issue this error: ``` Cannot load `Rails.application.database_configuration`: Invalid DATABASE_URL: nil (erb):9:in `rescue in <main>' (erb):6:in `<main>' /Users/schneems/.rbenv/versions/2.1.0/lib/ruby/2.1.0/erb.rb:850:in `eval' /Users/schneems/.rbenv/versions/2.1.0/lib/ruby/2.1.0/erb.rb:850:in `result' /Users/schneems/Documents/projects/rails/railties/lib/rails/application/configuration.rb:98:in `database_configuration' /Users/schneems/Documents/projects/rails/activerecord/lib/active_record/railtie.rb:41:in `block in <class:Railtie>' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `instance_exec' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `block in run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `each' /Users/schneems/Documents/projects/rails/railties/lib/rails/railtie.rb:237:in `run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/application.rb:339:in `block in run_tasks_blocks' /Users/schneems/Documents/projects/rails/railties/lib/rails/engine/railties.rb:13:in `each' ```
* | | | | | | | AestheticRafael Mendonça França2014-01-293-13/+13
| | | | | | | |
* | | | | | | | Merge pull request #13867 from mauricio/bug-13861Rafael Mendonça França2014-01-295-1/+52
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing issue with activerecord serialization not being able to dump a record after loading it from YAML - fixes #13861
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 10:35:41 +0000