Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #16373 from eileencodes/deprecate-reflection-source_macro | Rafael Mendonça França | 2014-08-02 | 2 | -1/+15 |
|\ \ \ \ | | | | | | | | | | | Deprecate source_macro | ||||
| * | | | | Deprecate source_macro | eileencodes | 2014-08-02 | 2 | -1/+15 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | `source_macro` is no longer used in any ActiveRecord code. I've chosen to deprecate it because it was not marked as nodoc and may be in use outside of rails source. | ||||
* | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-08-02 | 4 | -30/+11 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/testing.md | ||||
| * | | | | copy edits[ci skip] | Vijay Dev | 2014-08-02 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | [ci skip] Normalize all localhost linking. | Juanito Fatas | 2014-07-20 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Performed Returns true if redirect/render has happened | Gaurish Sharma | 2014-07-19 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | [ci skip] Remove duplicated last! section. | Juanito Fatas | 2014-07-16 | 1 | -17/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference: https://github.com/rails/rails/commit/d4fd0bd17709735ac91e434c94fe99429f078c6e cc @schneems | ||||
| * | | | | [ci skip] Use appropriate mailer syntax. | Juanito Fatas | 2014-07-16 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | Reference: https://github.com/rails/rails/commit/f7e4362011ceb1317fd401125d48d7ccb9a1079c | ||||
| * | | | | Add link to minitest rdoc & github | Gaurish Sharma | 2014-07-13 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | just set the host, no need for another hash allocation / merge! | Aaron Patterson | 2014-08-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | always return a string from find_script_name | Aaron Patterson | 2014-08-01 | 2 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | this allows us to avoid nil checks on the return value | ||||
* | | | | | Rename tests too | Rafael Mendonça França | 2014-08-01 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Rename Object#self to Object#itself to have parity with matz sanctioned ↵ | David Heinemeier Hansson | 2014-08-01 | 4 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | method name for Ruby 2.2 | ||||
* | | | | | Added Object#self which returns the object itself | David Heinemeier Hansson | 2014-08-01 | 4 | -0/+26 |
| | | | | | |||||
* | | | | | Use available method rather than macro name checking | Carlos Antonio da Silva | 2014-07-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Rename method for clarity | Carlos Antonio da Silva | 2014-07-31 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | Ruby generally does not use the is_* prefix on predicate methods. | ||||
* | | | | | use `get` instead of accessing the named routes internals | Aaron Patterson | 2014-07-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #16363 from arthurnn/null_transaction | Rafael Mendonça França | 2014-07-31 | 2 | -70/+67 |
|\ \ \ \ \ | | | | | | | | | | | | | Null transaction | ||||
| * | | | | | Replace ClosedTransaction with NullTransaction | Arthur Neves | 2014-07-31 | 2 | -8/+5 |
| | | | | | | |||||
| * | | | | | Move TransactionManager to bottom of class | Arthur Neves | 2014-07-31 | 1 | -67/+67 |
|/ / / / / | |||||
* | | | | | Merge pull request #16341 from arthurnn/transactions_remove_begin | Rafael Mendonça França | 2014-07-31 | 2 | -56/+20 |
|\ \ \ \ \ | | | | | | | | | | | | | Transactions refactoring - 2 | ||||
| * | | | | | Make ClosedTransaction a null object | Arthur Neves | 2014-07-31 | 1 | -16/+6 |
| | | | | | | |||||
| * | | | | | Remove parent on Transaction object | Arthur Neves | 2014-07-31 | 1 | -16/+9 |
| | | | | | |