Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16426 from tgxworld/fix_false_positive | Santiago Pastorino | 2014-08-08 | 1 | -4/+5 |
|\ | | | | | Fixes to TestCaseTest. | ||||
| * | Fixes to TestCaseTest. | Guo Xiang Tan | 2014-08-08 | 1 | -4/+5 |
| | | |||||
* | | Fix the #const_regexp's documentation [ci skip] | Robin Dupret | 2014-08-08 | 1 | -3/+4 |
| | | | | | | | | | | | | Originally introduced in f9086d63, the documentation of this method is wrong as #const_regexp returns a string to easy the interpolation inside regular expressions. | ||||
* | | Merge pull request #16430 from guillermo/patch-1 | Rafael Mendonça França | 2014-08-08 | 1 | -1/+1 |
|\ \ | | | | | | | Fix typo in plugins doc | ||||
| * | | Fix typo in plugins doc | Guillermo Álvarez Fernández | 2014-08-08 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #16428 from tomkadwill/activerecord_associations_name_param | Carlos Antonio da Silva | 2014-08-08 | 1 | -4/+4 |
|\ \ | |/ |/| | [ci skip] Changed 'first argument' to '+name+ argument' | ||||
| * | [ci skip] Changed 'first argument' to '+name+ argument' | Tom Kadwill | 2014-08-08 | 1 | -4/+4 |
|/ | |||||
* | Rephrase how we explain RecordInvalid exception in the context of | Zachary Scott | 2014-08-07 | 1 | -3/+5 |
| | | | | | | `#create!` regarding validations in contrast to the behavior of `#create`. Also describe creating multiple objects using an array of hashes as the +attributes+ parameter. [ci skip] /cc #16384 | ||||
* | Merge pull request #16384 from tomkadwill/improved_create_documentation | Zachary Scott | 2014-08-07 | 1 | -2/+5 |
|\ | | | | | [ci skip] Added +object+ and +attributes+ to create! description for rdoc | ||||
| * | [ci skip] Updated create! documentation description and added +attributes+ ↵ | Tom Kadwill | 2014-08-07 | 1 | -2/+5 |
| | | | | | | | | for rdoc | ||||
* | | Pull spring gem entry into the Gemfile template instead of gemfile_entries ↵ | David Heinemeier Hansson | 2014-08-07 | 2 | -10/+12 |
| | | | | | | | | so it can be grouped with the other development tools | ||||
* | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2014-08-07 | 37 | -207/+400 |
|\ \ | |||||
| * | | need to call super | Aaron Patterson | 2014-08-07 | 1 | -0/+1 |
| | | | |||||
| * | | add a new constructor that runs load hooks | Aaron Patterson | 2014-08-07 | 2 | -5/+9 |
| | | | |||||
| * | | defer running after_config hooks until after the object is allocated | Aaron Patterson | 2014-08-07 | 1 | -7/+22 |
| | | | |||||
| * | | Merge pull request #16424 from gregors/remove_dead_code | Rafael Mendonça França | 2014-08-07 | 1 | -36/+0 |
| |\ \ | | | | | | | | | remove dead file_watcher code | ||||
| | * | | remove dead file_watcher code | Gregory Ostermayr | 2014-08-07 | 1 | -36/+0 |
| | | | | |||||
| * | | | use the uri parser so that newer version of Ruby work | Aaron Patterson | 2014-08-07 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #16421 from tsukasaoishi/prevant_manycall_showtables | Aaron Patterson | 2014-08-07 | 1 | -0/+7 |
| |\ \ | | | | | | | | | Tables existence check query is executed in large quantities | ||||
| | * | | change to empty? from blank? | tsukasaoishi | 2014-08-08 | 1 | -1/+1 |
| | | | | |||||
| | * | | Tables existence check query is executed in large quantities | tsukasaoishi | 2014-08-07 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Rails starts, tables existence check query is executed number of models. In case of mysql, SHOW TABLES LIKE 'table1'; SHOW TABLES LIKE 'table2'; SHOW TABLES LIKE 'table3'; ... SHOW TABLES LIKE 'table999'; Add process to get the names of all tables by one query. | ||||
| * | | | Merge pull request #16422 from tgxworld/fix_spelling | Yves Senn | 2014-08-07 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | | | | | Closes #16422 | ||||
| | * | | Fix spelling. | Guo Xiang Tan | 2014-08-07 | 1 | -1/+1 |
| |/ / | |||||
| * | | Fix typo [ci skip] | Carlos Antonio da Silva | 2014-08-07 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #16412 from yevhene/master | Santiago Pastorino | 2014-08-07 | 3 | -2/+18 |
| |\ \ | | | | | | | | | Fix in has_secure_password for passwords containing only spaces. | ||||
| | * | | Allow password to contain spaces only. | Yevhene Shemet | 2014-08-06 | 3 | -2/+18 |
| | | | | |||||
| * | | | Merge pull request #16419 from tgxworld/remove_legacy_code | Santiago Pastorino | 2014-08-07 | 1 | -34/+0 |
| |\ \ \ | | | | | | | | | | | Remove ActionController::RaiseActionExceptions. | ||||
| | * | | | Remove ActionController::RaiseActionExceptions. | Guo Xiang Tan | 2014-08-07 | 1 | -34/+0 |
| |/ / / | | | | | | | | | | | | | | | | | The latest modification to the code was done in https://github.com/rails/rails/commit/5e3517ea. In Rails 3.2, `ActionController#rescue_action` was deprecated and `rescue_action_without_handler` is no longer being used. | ||||
| * | | | Define id_was to get the previous value of the primary key | Rafael Mendonça França | 2014-08-06 | 3 | -1/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when we call id_was and we have a custom primary key name Active Record will return the current value of the primary key. This make impossible to correctly do an update operation if you change the id. Fixes #16413 | ||||
| * | | | Test using turbolinks master | Rafael Mendonça França | 2014-08-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | See https://github.com/rails/turbolinks/commit/153f1b0f04c718442cfd73365a2778dfe1a1c5c7 | ||||
| * | | | Fix DateTime comparison with DateTime::Infinity object | Rafael Mendonça França | 2014-08-06 | 3 | -1/+8 |
| | | | | | | | | | | | | | | | | Fixes #16406 | ||||
| * | | | lazily instantiate application subclasses | Aaron Patterson | 2014-08-06 | 3 | -4/+18 |
| | | | | | | | | | | | | | | | | this means we can meaningfully override methods in the subclass | ||||
| * | | | refactor Redirecting so we do not need a controller instance | Aaron Patterson | 2014-08-06 | 2 | -10/+7 |
| | |/ | |/| | |||||
| * | | defined? should actually work in current implementation | Akira Matsuda | 2014-08-07 | 1 | -9/+0 |
| |/ | | | | | | | So this trick is not needed to be documented anymore. | ||||
| * | Merge pull request #16402 from bogdan/select_with_empty_block | Santiago Pastorino | 2014-08-06 | 2 | -1/+14 |
| |\ | | | | | | | Fixed #select form builder helper to support block without html output | ||||
| | * | Fixed #select form builder helper to support block with html output | Bogdan Gusiev | 2014-08-05 | 2 | -1/+14 |
| | | | |||||
| * | | Merge pull request #16359 from skanev/after-bundle-in-rails-templates | Yves Senn | 2014-08-06 | 7 | -3/+95 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add an after_bundle callback in Rails templates Conflicts: railties/CHANGELOG.md | ||||
| | * | | Add after_bundle to the release notes and upgrade guide | Stefan Kanev | 2014-08-05 | 2 | -0/+35 |
| | | | | |||||
| | * | | Add an after_bundle callback in Rails templates | Stefan Kanev | 2014-08-03 | 5 | -3/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | The template runs before the generation of binstubs – this does not allow to write one, that makes an initial commit to version control. It is solvable by adding an after_bundle callback. | ||||
| * | | | Merge pull request #16316 from rails/senny/purge_schema_maintenance | Yves Senn | 2014-08-06 | 6 | -14/+133 |
| |\ \ \ | | | | | | | | | | | purge database before loading schema, take 2 | ||||
| | * | | | schema rake tasks are specific about the configuration to act on. | Yves Senn | 2014-08-06 | 4 | -22/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rake tasks and the `DatabaseTakss` adapter classes used to assume a configuration at some places. This forced the rake tasks to establish a specific connection before calling into `load_schema`. After #15394 this started to cause issues because it could `purge` the wrong database before loading the schema. | ||||
| | * | | | Revert "Revert "Merge pull request #15394 from ↵ | Yves Senn | 2014-08-06 | 4 | -3/+105 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | morgoth/fix-automatic-maintaining-test-schema-for-sql-format"" This reverts commit 5c87b5c5248154cf8aa76cce9a24a88769de022d. | ||||
| * | | | call the routes method on engines | Aaron Patterson | 2014-08-05 | 1 | -74/+37 |
| | | | | | | | | | | | | | | | | if we access the instance, we can free up lots of codes | ||||
| * | | | a rails application should be an engine subclass | Aaron Patterson | 2014-08-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | no reason to lazily instantiate the routes | Aaron Patterson | 2014-08-05 | 1 | -45/+42 |
| | | | | | | | | | | | | | | | | | | | | especially if you're just going to add a call two lines down that populates the cache. common. | ||||
* | | | | Stop using padding in the generated Gemfile -- it looks shit | David Heinemeier Hansson | 2014-08-07 | 2 | -6/+1 |
|/ / / | |||||
* | | | Merge pull request #16364 from arthurnn/make_transaction_one_class | Jeremy Kemper | 2014-08-05 | 2 | -72/+56 |
|\ \ \ | | | | | | | | | Clarify Transaction responsibilities by breaking unneeded inheritance hierarchy. | ||||
| * | | | Cleanup Transaction inheritance. | Arthur Neves | 2014-08-05 | 2 | -72/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transaction class doesnt need to encapsulate the transaction state using inheritance. This removes all Transaction subclasses, and let the Transaction object controls different actions based on its own state. Basically the only actions would behave differently are `being`,`commit`,`rollback` as they could act in a savepoint or in a real transaction. | ||||
* | | | | just assign the instance variables on the test | Aaron Patterson | 2014-08-05 | 1 | -7/+3 |
| | | | | |||||
* | | | | We don't need parenthesis for this | Guillermo Iguaran | 2014-08-05 | 1 | -1/+1 |
| | | | |