aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10349 from caliper-io/mute_psql_outputAaron Patterson2013-04-303-2/+6
|\ | | | | Fix noisy output when running rake db:schema:load on postgreSQL and structure.sql
| * Mute psql output when running rake db:schema:loadGodfrey Chan2013-04-303-2/+6
|/
* Fix #8856 Ensure has_one association=(associate) triggers save.Chris Thompson2013-04-303-3/+24
| | | | | | | | | | | | | | | | | | | | | | | activerecord/lib/active_record/associations.rb states: # [association=(associate)] # Assigns the associate object, extracts the primary key, sets it as the foreign key, # and saves the associate object. Since commit 42dd5d9f2976677a4bf22347f2dde1a8135dfbb4 to fix #7191, this is no longer the case if the associate has changed, but is the same object. For example: # Pirate has_one :ship pirate = Pirate.create!(catchphrase: "A Pirate") ship = pirate.build_ship(name: 'old name') ship.save! ship.name = 'new name' pirate.ship = ship That last line should trigger a save. Although we are not changing the association, the associate (ship) has changed.
* Fix typos in deprecation proxy docs [ci skip]Carlos Antonio da Silva2013-04-301-3/+3
|
* Merge pull request #10390 from Noemj/bind_param_handlingRafael Mendonça França2013-04-301-3/+3
|\ | | | | Added :nodoc: for relation.rb's private methods
| * Added :nodoc: for private methodsNoemj2013-04-301-3/+3
| |
* | Merge pull request #10389 from ↵Rafael Mendonça França2013-04-3013-18/+22
|\ \ | | | | | | | | | | | | wangjohn/removing_the_app_constant_and_replace_with_rails_application_instance Removing the app constant and replacing it with Rails.application
| * | Removing the app constant and replacing it with Rails.applicationwangjohn2013-04-3013-18/+22
|/ / | | | | | | | | syntax. This helps removing the class level abstraction of an application.
* | Merge pull request #10339 from eiel/unused-requireRafael Mendonça França2013-04-301-1/+0
|\ \ | | | | | | remove unused require
| * | remove unused requireTomohiko Himura2013-04-251-1/+0
| | | | | | | | | | | | not used remove_possible_method
* | | Merge pull request #10388 from benolee/fix-parser-semicolonRafael Mendonça França2013-04-301-0/+1
|\ \ \ | | | | | | | | add missing semicolon to journey parser.y
| * | | add missing semicolon to journey parser.yBen Holley2013-04-301-0/+1
|/ / /
* | | mysql needs to reconnect after recreate. Thanks @mperhamAaron Patterson2013-04-301-0/+1
| | |
* | | Merge pull request #10386 from kennyj/should_stop_task_when_missing_fileRafael Mendonça França2013-04-304-6/+21
|\ \ \ | | | | | | | | Abort a rake task when missing db/structure.sql like `db:schema:load` task.
| * | | Abort a rake task when missing db/structure.sql like `db:schema:load` task.kennyj2013-05-014-6/+21
| | | |
* | | | Merge pull request #10387 from gaurish/rack-mountRafael Mendonça França2013-04-301-1/+1
|\ \ \ \ | |/ / / |/| | | Rack::Mount was replaced by Journey, Fixed comment
| * | | Rack::Mount was replaced by Journey, Fixed commentGaurish Sharma2013-04-301-1/+1
|/ / /
* | | Merge pull request #10357 from ↵Rafael Mendonça França2013-04-301-6/+6
|\ \ \ | | | | | | | | | | | | | | | | arunagw/minor-code-deuplication-removed-app-generator Minor code duplication removed
| * | | Minor code duplication removedArun Agrawal2013-04-291-6/+6
| | | |
* | | | Merge pull request #10385 from siong1987/fix_rake_doc_guidesXavier Noria2013-04-302-3/+3
|\ \ \ \ | | | | | | | | | | Make `rake doc:guides` works again. Fix #10384.
| * | | | Make `rake doc:guides` works again. Fix #10384.Teng Siong Ong2013-04-302-3/+3
| | | | |
* | | | | Merge pull request #10383 from Noemj/bind_param_handlingRafael Mendonça França2013-04-302-26/+28
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | Moved update_record logic to relation.rb
| * | | Moved update_record logic to relation.rbNoemj2013-04-302-26/+28
|/ / /
* | | Merge pull request #10379 from frodsan/fix_nodoc_ar_delegationGuillermo Iguaran2013-04-291-3/+3
|\ \ \ | | | | | | | | add missing :nodoc: marks to ActiveRecord::Delegation [ci skip]
| * | | add missing :nodoc: marks to ActiveRecord::Delegation [ci skip]Francesco Rodriguez2013-04-291-3/+3
|/ / /
* | | Merge pull request #10378 from frodsan/fix_precompiling_assets_sectionRafael Mendonça França2013-04-291-1/+1
|\ \ \ | | | | | | | | Fix assets precompiling in production guide
| * | | Fix guide section about assets precompiling task in production [ci skip]Francesco Rodriguez2013-04-291-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | You need to specify `RAILS_ENV=production` Related to https://github.com/rails/sass-rails/issues/152. /cc @guilleiguaran
* | | Merge pull request #9791 from wangjohn/remove_configurableRafael Mendonça França2013-04-295-21/+45
|\ \ \ | | | | | | | | Removing Railtie::Configurable and replacing it with class methods
| * | | Removing Railtie::Configurable from the base Railtie object and makingwangjohn2013-04-295-21/+45
|/ / / | | | | | | | | | | | | Railtie itself abstract. This stops the weird behavior of forcing subclasses of Railtie to include the Configurable module.
* | | rails/master is now 4.1.0.betaRafael Mendonça França2013-04-2914-4410/+22
| | |
* | | Bump version to rc1David Heinemeier Hansson2013-04-298-8/+8
| | |
* | | Bump activerecord-deprecated_finders. Fixes #10304Rafael Mendonça França2013-04-291-1/+1
| | |
* | | Merge pull request #10372 from ↵Jeremy Kemper2013-04-283-12/+13
|\ \ \ | | | | | | | | | | | | | | | | jeremy/statement-invalid-wraps-underlying-exception StatementInvalid takes WrappedDatabaseException's place
| * | | StatementInvalid takes WrappedDatabaseException's placeJeremy Kemper2013-04-283-12/+13
| | | |
* | | | Delegate #unscope query methodCarlos Antonio da Silva2013-04-282-1/+11
|/ / /
* | | Merge pull request #10364 from wangjohn/refactoring_activesupport_cacheJeremy Kemper2013-04-281-10/+23
|\ \ \ | | | | | | | | Making the retrieval of the cache store class a method
| * | | Making the retrieval of the cache store class a method, also wrotewangjohn2013-04-281-10/+23
| | | | | | | | | | | | | | | | comments for the expand_cache_key method.
* | | | Merge pull request #10361 from teeparham/patch-1Carlos Antonio da Silva2013-04-281-1/+1
|\ \ \ \ | | | | | | | | | | Fix travis links in readme [ci skip]
| * | | | fix travis links in readmeTee Parham2013-04-261-1/+1
| | | | | | | | | | | | | | | links were redirects
* | | | | Merge pull request #10368 from demands/fix-typoGuillermo Iguaran2013-04-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix typo in serialized_attribute_test. [ci skip]
| * | | | | Fix typo in serialized_attribute_test. [ci skip]Max Edmands2013-04-281-1/+1
| | | | | |
* | | | | | Use new hash syntax in module delegation docs [ci skip]Carlos Antonio da Silva2013-04-281-1/+1
| |_|/ / / |/| | | |
* | | | | fixes a test, and explains why AR::AttributeMethods checks ↵Xavier Noria2013-04-283-6/+8
| | | | | | | | | | | | | | | | | | | | defined?(@attributes) in some places
* | | | | pass over the code commentsXavier Noria2013-04-281-28/+32
|/ / / / | | | | | | | | | | | | | | | | | | | | * Highlights the requirement of an attributes method. * Removes some details that depend on the implementation of the class including the module. * Applies guidelines here and there.
* | | | Don't reprocess the options hash on every requestAndrew White2013-04-271-1/+2
| | | |
* | | | adding test for the symbol refsAaron Patterson2013-04-261-0/+7
| | | |
* | | | Module#delegate checks nilness rather that falsehood if :allow_nil is true, ↵Xavier Noria2013-04-262-30/+73
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and avoids multiple evaluation of the target method Notes: 1) I hope nilness is a word. 2) See rationale for avoiding multiple evaluation in a comment in the patch, credit goes to @jeremy for pointing out this gotcha in the existing implementation. 3) Embeds a little joke dedicated to @pixeltrix (it could be worse! :D). References #10347.
* | | Merge pull request #9980 from stouset/patch-1Andrew White2013-04-261-4/+5
|\ \ \ | | | | | | | | | | | | | | | | Improve poor security recommendation in docs [ci skip]
| * | | Improve poor security recommendation in docsStephen Touset2013-03-281-4/+5
| | | | | | | | | | | | | | | | | | | | As reported in #9960, the current documentation recommends an insecure practice for key generation from a password (a single round of SHA-256). The modified documentation uses ActiveSupport::KeyGenerator to perform proper key stretching.
* | | | Merge pull request #10351 from ↵Xavier Noria2013-04-262-5/+10
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | JonRowe/update_as_date_next_week_to_document_intent Propose better documentation for ActiveSupports `next_week` functionaility
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-18 14:03:43 +0000