aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Pull spring gem entry into the Gemfile template instead of gemfile_entries ↵David Heinemeier Hansson2014-08-072-10/+12
| | | | so it can be grouped with the other development tools
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-0737-207/+400
|\
| * need to call superAaron Patterson2014-08-071-0/+1
| |
| * add a new constructor that runs load hooksAaron Patterson2014-08-072-5/+9
| |
| * defer running after_config hooks until after the object is allocatedAaron Patterson2014-08-071-7/+22
| |
| * Merge pull request #16424 from gregors/remove_dead_codeRafael Mendonça França2014-08-071-36/+0
| |\ | | | | | | remove dead file_watcher code
| | * remove dead file_watcher codeGregory Ostermayr2014-08-071-36/+0
| | |
| * | use the uri parser so that newer version of Ruby workAaron Patterson2014-08-071-1/+1
| |/
| * Merge pull request #16421 from tsukasaoishi/prevant_manycall_showtablesAaron Patterson2014-08-071-0/+7
| |\ | | | | | | Tables existence check query is executed in large quantities
| | * change to empty? from blank?tsukasaoishi2014-08-081-1/+1
| | |
| | * Tables existence check query is executed in large quantitiestsukasaoishi2014-08-071-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_spellingYves Senn2014-08-071-1/+1
| |\ \ | | |/ | |/| | | | Closes #16422
| | * Fix spelling.Guo Xiang Tan2014-08-071-1/+1
| |/
| * Fix typo [ci skip]Carlos Antonio da Silva2014-08-071-1/+1
| |
| * Merge pull request #16412 from yevhene/masterSantiago Pastorino2014-08-073-2/+18
| |\ | | | | | | Fix in has_secure_password for passwords containing only spaces.
| | * Allow password to contain spaces only.Yevhene Shemet2014-08-063-2/+18
| | |
| * | Merge pull request #16419 from tgxworld/remove_legacy_codeSantiago Pastorino2014-08-071-34/+0
| |\ \ | | | | | | | | Remove ActionController::RaiseActionExceptions.
| | * | Remove ActionController::RaiseActionExceptions.Guo Xiang Tan2014-08-071-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 keyRafael Mendonça França2014-08-063-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 masterRafael Mendonça França2014-08-061-1/+1
| | | | | | | | | | | | | | | See https://github.com/rails/turbolinks/commit/153f1b0f04c718442cfd73365a2778dfe1a1c5c7
| * | Fix DateTime comparison with DateTime::Infinity objectRafael Mendonça França2014-08-063-1/+8
| | | | | | | | | | | | Fixes #16406
| * | lazily instantiate application subclassesAaron Patterson2014-08-063-4/+18
| | | | | | | | | | | | this means we can meaningfully override methods in the subclass
| * | refactor Redirecting so we do not need a controller instanceAaron Patterson2014-08-062-10/+7
| | |
| * | defined? should actually work in current implementationAkira Matsuda2014-08-071-9/+0
| |/ | | | | | | So this trick is not needed to be documented anymore.
| * Merge pull request #16402 from bogdan/select_with_empty_blockSantiago Pastorino2014-08-062-1/+14
| |\ | | | | | | Fixed #select form builder helper to support block without html output
| | * Fixed #select form builder helper to support block with html outputBogdan Gusiev2014-08-052-1/+14
| | |
| * | Merge pull request #16359 from skanev/after-bundle-in-rails-templatesYves Senn2014-08-067-3/+95
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add an after_bundle callback in Rails templates Conflicts: railties/CHANGELOG.md
| | * | Add after_bundle to the release notes and upgrade guideStefan Kanev2014-08-052-0/+35
| | | |
| | * | Add an after_bundle callback in Rails templatesStefan Kanev2014-08-035-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_maintenanceYves Senn2014-08-066-14/+133
| |\ \ \ | | | | | | | | | | purge database before loading schema, take 2
| | * | | schema rake tasks are specific about the configuration to act on.Yves Senn2014-08-064-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 Senn2014-08-064-3/+105
| |/ / / | | | | | | | | | | | | | | | | | | | | morgoth/fix-automatic-maintaining-test-schema-for-sql-format"" This reverts commit 5c87b5c5248154cf8aa76cce9a24a88769de022d.
| * | | call the routes method on enginesAaron Patterson2014-08-051-74/+37
| | | | | | | | | | | | | | | | if we access the instance, we can free up lots of codes
| * | | a rails application should be an engine subclassAaron Patterson2014-08-051-1/+1
| | | |
| * | | no reason to lazily instantiate the routesAaron Patterson2014-08-051-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 shitDavid Heinemeier Hansson2014-08-072-6/+1
|/ / /
* | | Merge pull request #16364 from arthurnn/make_transaction_one_classJeremy Kemper2014-08-052-72/+56
|\ \ \ | | | | | | | | Clarify Transaction responsibilities by breaking unneeded inheritance hierarchy.
| * | | Cleanup Transaction inheritance.Arthur Neves2014-08-052-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 testAaron Patterson2014-08-051-7/+3
| | | |
* | | | We don't need parenthesis for thisGuillermo Iguaran2014-08-051-1/+1
| | | |
* | | | Merge pull request #16405 from arthurnn/fix_digest_etag_testGuillermo Iguaran2014-08-051-1/+1
|\ \ \ \ | | | | | | | | | | Fix digest ETAG test.
| * | | | Fix digest ETAG test.Arthur Neves2014-08-051-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | After https://github.com/rack/rack/commit/12528d4567d8e6c1c7e9422fee6cd8b43c4389bf ETag will include a `W/` before the digest.
* | | | Merge pull request #16404 from bogdan/move-create-with-bangCarlos Antonio da Silva2014-08-052-15/+12
|\ \ \ \ | | | | | | | | | | | | | | | Moved #create! method from Validations to Persistence module
| * | | | Moved #create! method from Validations to Persistence moduleBogdan Gusiev2014-08-052-15/+12
| | |_|/ | |/| |
* | | | Fix AS docs / changelog with wrong method [ci skip]Carlos Antonio da Silva2014-08-052-3/+3
| | | |
* | | | Bring back the helpers testsJosé Valim2014-08-053-0/+50
| | | | | | | | | | | | | | | | | | | | Also keep the hook as other tools may rely on it, we just don't do anything by default on Rails.
* | | | Remove unused text? predicate method and delegationCarlos Antonio da Silva2014-08-052-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method has been removed in 09206716f8695f6b8467f15c1befa5a4c3c10978 (PR #16074), but the delegation was apparently missed, and one instance of the method was added back with the addition of OID::Xml in 336be2bdf7dfa1b31879d0ab27e5f3101b351923 (PR #16072), so we can safely rm both.
* | | | Call public methods rather than class_eval'ingCarlos Antonio da Silva2014-08-051-4/+2
|/ / /
* | | avoid testing only_pathAaron Patterson2014-08-042-2/+5
| | | | | | | | | | | | | | | we know that this call only wants the path returned, so lets call a method that returns the path.
* | | Merge pull request #16396 from ↵Rafael Mendonça França2014-08-041-2/+2
|\ \ \ | | | | | | | | | | | | | | | | eileencodes/dont-delegate-chain-to-through-association Don't delegate Reflection#chain to ThroughAssociation
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 11:57:35 +0000