aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
| * | | Don't delegate Reflection#chain to ThroughAssociationeileencodes2014-08-041-2/+2
|/ / / | | | | | | | | | | | | | | | We shouldn't be delegating chain to ThroughAssociation since the only place that needs to call it is `target_scope`. Instead we can call `reflecion.chain`.
* | | Merge pull request #16395 from jonatack/patch-8Rafael Mendonça França2014-08-041-1/+1
|\ \ \ | | | | | | | | Update itself.rb [ci skip]
| * | | Update itself.rb [ci skip]Jon Atack2014-08-051-1/+1
|/ / /
* | | Merge pull request #16375 from johnnyshields/guidesRichard Schneeman2014-08-041-0/+2
|\ \ \ | | | | | | | | Guides: Add definition of `config.assets.manifest` option to configuring.md
| * | | [ci skip] Guides: Add definition of `config.assets.manifest` option to ↵Johnny Shields2014-08-051-0/+2
| | |/ | |/| | | | | | | configuring.md
* | | Only define Objetc#itself when it is not definedRafael Mendonça França2014-08-041-8/+10
| | | | | | | | | | | | | | | | | | | | | Ruby 2.2 will include Kernel#itself so we don't need to define again. See https://github.com/ruby/ruby/commit/0a0160d6b659f6131a525fe1579e7c463d4c197e
* | | Merge pull request #16393 from jonatack/patch-8Rafael Mendonça França2014-08-041-1/+1
|\ \ \ | | | | | | | | Fix typo [ci skip]
| * | | Fix typo [ci skip]Jon Atack2014-08-041-1/+1
|/ / /
* | | Regenerate sid when sbdy tries to fixate the sessionSantiago Pastorino2014-08-042-12/+11
| | | | | | | | | | | | | | | | | | Fixed broken test. Thanks Stephen Richards for reporting.
* | | Merge pull request #16333 from ↵Yves Senn2014-08-043-4/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | joker1007/fix_decimal_cast_from_float_with_large_precision Fix type casting to Decimal from Float with large precision Conflicts: activerecord/CHANGELOG.md
| * | | Fix type casting to Decimal from Float with ...joker10072014-08-013-4/+26
| | | | | | | | | | | | | | | | | | | | When I defines large precision column at RDBMS, I assigns float value, raise ArgumentError (precision too large).
* | | | Explain why we use asset digests, not what a setter doesDavid Heinemeier Hansson2014-08-032-2/+4
| | | |
* | | | Add suggestion as to how you can app the the assets load pathDavid Heinemeier Hansson2014-08-031-0/+3
| | | |
* | | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-032-43/+33
|\ \ \ \
| * \ \ \ Merge pull request #16386 from JackDanger/journey-no-result-varGuillermo Iguaran2014-08-032-43/+33
| |\ \ \ \ | | | | | | | | | | | | Using no_result_var in Journey's parser generator
| | * | | | Using no_result_var in Journey's parser generatorJack Danger Canty2014-08-032-43/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the generated parser had an intermediate local variable `result` that really useful if you're building up a stateful object but Journey always discards the result argument to the reduce functions. This produces a simpler parser for anybody who actually wants to read the thing. Sadly, there's no real performance speedup with this change.
* | | | | | Pull in the custom configuration concept from dhh/custom_configurationDavid Heinemeier Hansson2014-08-035-1/+103
|/ / / / /
* | | | | A few more tests asserting the presence of helper test stubsDavid Heinemeier Hansson2014-08-036-17/+0
| | | | |
* | | | | Update docs to reflect that helper stubs are no longer generatedDavid Heinemeier Hansson2014-08-035-25/+2
| | | | |
* | | | | Stubs are no longer generated for helpers, so dont test for itDavid Heinemeier Hansson2014-08-031-4/+0
| | | | |
* | | | | Change the production log level default from :info to :debug. All production ↵David Heinemeier Hansson2014-08-031-2/+2
| | | | | | | | | | | | | | | | | | | | apps I have ever worked with has done this. Let us reflect that default. You often want those SQL quieries to be able to debug issues in production
* | | | | Generating stubs for helper tests is overly specific. Most helpers should ↵David Heinemeier Hansson2014-08-034-75/+0
|/ / / / | | | | | | | | | | | | simply be tested as part of the view thats using them. If you need something beyond that, you can add a test yourself for them
* | | | Merge pull request #16306 from aditya-kapoor/add-docs-for-uglifierZachary Scott2014-08-021-8/+9
|\ \ \ \ | | | | | | | | | | [ci skip] add tip for uglifier in execjs error
| * | | | [ci skip] add tip for uglifier in execjs errorAditya Kapoor2014-08-031-8/+9
| | | | |
* | | | | Merge pull request #16380 from y-yagi/patch-1Richard Schneeman2014-08-021-1/+0
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Remove "Machinist" from testing guide
| * | | | | [ci skip] Remove "Machinist" from testing guideyuuji.yaginuma2014-08-031-1/+0
|/ / / / /