aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Clarify arguments of head methodChase DuBois2013-04-141-1/+1
| |
| * Fixed typo [ci skip]Prathamesh Sonpatki2013-04-151-1/+1
| |
| * Tried to make the response status code table more readableIain Beeston2013-04-141-65/+65
| | | | | | | | By making it the last thing in it's section and adding pseudo row headers
| * Updated link to peepcode Git screencastPrathamesh Sonpatki2013-04-141-1/+1
| |
| * Added description for mtimePrathamesh Sonpatki2013-04-141-1/+1
| |
| * ARel -> ArelPrathamesh Sonpatki2013-04-141-1/+1
| |
| * Changed grammar for better readabilityPrathamesh Sonpatki2013-04-141-1/+1
| |
* | maintain return value for recreate_databaseAaron Patterson2013-04-301-1/+2
| |
* | Merge pull request #9857 from yyyc514/bad_params_should_400Aaron Patterson2013-04-303-0/+8
|\ \ | | | | | | failure to parse params should trigger a 400 Bad Request
| * | failure to parse params should trigger a 400 Bad RequestJosh Goebel2013-03-213-0/+8
| | |
* | | 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]