Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | 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 | |
| | | | | ||||||
* | | | | Merge pull request #16405 from arthurnn/fix_digest_etag_test | Guillermo Iguaran | 2014-08-05 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Fix digest ETAG test. | |||||
| * | | | | Fix digest ETAG test. | Arthur Neves | 2014-08-05 | 1 | -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-bang | Carlos Antonio da Silva | 2014-08-05 | 2 | -15/+12 | |
|\ \ \ \ | | | | | | | | | | | | | | | | Moved #create! method from Validations to Persistence module | |||||
| * | | | | Moved #create! method from Validations to Persistence module | Bogdan Gusiev | 2014-08-05 | 2 | -15/+12 | |
| | |_|/ | |/| | | ||||||
* | | | | Fix AS docs / changelog with wrong method [ci skip] | Carlos Antonio da Silva | 2014-08-05 | 2 | -3/+3 | |
| | | | | ||||||
* | | | | Bring back the helpers tests | José Valim | 2014-08-05 | 3 | -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 delegation | Carlos Antonio da Silva | 2014-08-05 | 2 | -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'ing | Carlos Antonio da Silva | 2014-08-05 | 1 | -4/+2 | |
|/ / / | ||||||
* | | | avoid testing only_path | Aaron Patterson | 2014-08-04 | 2 | -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ça | 2014-08-04 | 1 | -2/+2 | |
|\ \ \ | | | | | | | | | | | | | | | | | eileencodes/dont-delegate-chain-to-through-association Don't delegate Reflection#chain to ThroughAssociation | |||||
| * | | | Don't delegate Reflection#chain to ThroughAssociation | eileencodes | 2014-08-04 | 1 | -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-8 | Rafael Mendonça França | 2014-08-04 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Update itself.rb [ci skip] | |||||
| * | | | Update itself.rb [ci skip] | Jon Atack | 2014-08-05 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #16375 from johnnyshields/guides | Richard Schneeman | 2014-08-04 | 1 | -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 Shields | 2014-08-05 | 1 | -0/+2 | |
| | |/ | |/| | | | | | | | configuring.md | |||||
* | | | Only define Objetc#itself when it is not defined | Rafael Mendonça França | 2014-08-04 | 1 | -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-8 | Rafael Mendonça França | 2014-08-04 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fix typo [ci skip] | |||||
| * | | | Fix typo [ci skip] | Jon Atack | 2014-08-04 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Regenerate sid when sbdy tries to fixate the session | Santiago Pastorino | 2014-08-04 | 2 | -12/+11 | |
| | | | | | | | | | | | | | | | | | | Fixed broken test. Thanks Stephen Richards for reporting. | |||||
* | | | Merge pull request #16333 from ↵ | Yves Senn | 2014-08-04 | 3 | -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 ... | joker1007 | 2014-08-01 | 3 | -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 does | David Heinemeier Hansson | 2014-08-03 | 2 | -2/+4 | |
| | | | | ||||||
* | | | | Add suggestion as to how you can app the the assets load path | David Heinemeier Hansson | 2014-08-03 | 1 | -0/+3 | |
| | | | | ||||||
* | | | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2014-08-03 | 2 | -43/+33 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #16386 from JackDanger/journey-no-result-var | Guillermo Iguaran | 2014-08-03 | 2 | -43/+33 | |
| |\ \ \ \ | | | | | | | | | | | | | Using no_result_var in Journey's parser generator | |||||
| | * | | | | Using no_result_var in Journey's parser generator | Jack Danger Canty | 2014-08-03 | 2 | -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_configuration | David Heinemeier Hansson | 2014-08-03 | 5 | -1/+103 | |
|/ / / / / | ||||||
* | | | | | A few more tests asserting the presence of helper test stubs | David Heinemeier Hansson | 2014-08-03 | 6 | -17/+0 | |
| | | | | | ||||||
* | | | | | Update docs to reflect that helper stubs are no longer generated | David Heinemeier Hansson | 2014-08-03 | 5 | -25/+2 | |
| | | | | | ||||||
* | | | | | Stubs are no longer generated for helpers, so dont test for it | David Heinemeier Hansson | 2014-08-03 | 1 | -4/+0 | |
| | | | | | ||||||
* | | | | | Change the production log level default from :info to :debug. All production ↵ | David Heinemeier Hansson | 2014-08-03 | 1 | -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 Hansson | 2014-08-03 | 4 | -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-uglifier | Zachary Scott | 2014-08-02 | 1 | -8/+9 | |
|\ \ \ \ | | | | | | | | | | | [ci skip] add tip for uglifier in execjs error | |||||
| * | | | | [ci skip] add tip for uglifier in execjs error | Aditya Kapoor | 2014-08-03 | 1 | -8/+9 | |
| | | | | | ||||||
* | | | | | Merge pull request #16380 from y-yagi/patch-1 | Richard Schneeman | 2014-08-02 | 1 | -1/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | [ci skip] Remove "Machinist" from testing guide | |||||
| * | | | | | [ci skip] Remove "Machinist" from testing guide | yuuji.yaginuma | 2014-08-03 | 1 | -1/+0 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #16378 from ↵ | Rafael Mendonça França | 2014-08-02 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | JackDanger/doc-fix-in-join-association-build_constraint [doc] updating documented parameter for build_constraint | |||||
| * | | | | | updating documented parameter for build_constraint | Jack Danger Canty | 2014-08-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates documentation in line with changes made in 743b67508e2027e1d086142ccbec47a19fc943f6 | |||||
* | | | | | | Merge pull request #16377 from JackDanger/doc-fix-in-association-reflection | Eileen M. Uchitelle | 2014-08-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Fixes small error in ActiveRecord::Reflection docs | |||||
| * | | | | | Fixes small error in ActiveRecord::Reflection docs | Jack Danger Canty | 2014-07-31 | 1 | -1/+1 | |
| |/ / / / | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | [ci skip] fix markdown | schneems | 2014-08-02 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #16374 from rajcybage/consistency_minitest | Rafael Mendonça França | 2014-08-02 | 2 | -3/+3 | |
|\ \ \ \ \ | | | | | | | | | | | | | rename MiniTest to Minitest | |||||
| * | | | | | rename MiniTest to Minitest | Rajarshi Das | 2014-08-02 | 2 | -3/+3 | |
| | |/ / / | |/| | | |