Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12821 from arunagw/aa-removed-missleading-message | Yves Senn | 2013-11-09 | 2 | -2/+2 |
|\ | | | | | clarified missleading message | ||||
| * | Changed message for Model.inspect | Arun Agrawal | 2013-11-09 | 2 | -2/+2 |
| | | | | | | | | | | | | | | (No database connection) sounds not be able to connect database. see more #12804 | ||||
* | | improve Active Record Store docs when using PG types. [ci skip]. | Yves Senn | 2013-11-09 | 1 | -3/+4 |
| | | |||||
* | | Require the top file and autoload Base class | Rafael Mendonça França | 2013-11-09 | 3 | -3/+2 |
| | | | | | | | | | | | | | | The generators entry point file is rails/generators so we need to make sure uers will be able to use the generators when requiring that file. Fixes #12802 | ||||
* | | type casted PG bytea values are represented as a Hash. | Yves Senn | 2013-11-09 | 1 | -0/+2 |
| | | | | | | | | | | This is a follow up to: 97f0d9a0dd12e7ad634815eecfeff866f64aad92 This change is also related to: df0edafac9eb47cd971970a9e7b13a3eaddf214e | ||||
* | | Document the bind return | Rafael Mendonça França | 2013-11-09 | 1 | -0/+3 |
| | | |||||
* | | Avoid shot circuit return. | Rafael Mendonça França | 2013-11-09 | 1 | -8/+20 |
| | | | | | | | | This will make the conditional and to code clear | ||||
* | | Improve changelogs formatting [ci skip] | Carlos Antonio da Silva | 2013-11-09 | 3 | -22/+22 |
| | | |||||
* | | Don't use Active Support where we don't need to | Rafael Mendonça França | 2013-11-09 | 3 | -3/+3 |
| | | |||||
* | | Fix typo in AR store docs [ci skip] | Carlos Antonio da Silva | 2013-11-09 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #12760 from pseidemann/master | Yves Senn | 2013-11-09 | 3 | -2/+11 |
|\ | | | | | fix simple_format escapes own output when sanitize is set to true | ||||
| * | fix simple_format escapes own output when sanitize is set to true | pseidemann | 2013-11-08 | 3 | -2/+11 |
| | | |||||
* | | log bind variables after they were type casted. | Yves Senn | 2013-11-09 | 5 | -10/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The log output used to be confusing in situation where type casting has "unexpected" effects. For example when finding records with a `String`. BEFORE: irb(main):002:0> Event.find("im-no-integer") D, [2013-11-09T11:10:28.998857 #1706] DEBUG -- : Event Load (4.5ms) SELECT "events".* FROM "events" WHERE "events"."id" = $1 LIMIT 1 [["id", "im-no-integer"]] AFTER: irb(main):002:0> Event.find("im-no-integer") D, [2013-11-09T11:10:28.998857 #1706] DEBUG -- : Event Load (4.5ms) SELECT "events".* FROM "events" WHERE "events"."id" = $1 LIMIT 1 [["id", 0]] | ||||
* | | Merge pull request #12816 from gaurish/skip-static-test | Rafael Mendonça França | 2013-11-08 | 1 | -0/+4 |
|\ \ | | | | | | | Skip test which is broken on jruby | ||||
| * | | Skip test which is broken on jruby | Gaurish Sharma | 2013-11-09 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | This test is broken from quite a while & is expected to remain broken as encoding issues are hardest to fix in JRuby. so lets skip this test for now | ||||
* | | | Merge pull request #12806 from vipulnsward/extract_common_code_in_number_helper | Rafael Mendonça França | 2013-11-08 | 1 | -30/+13 |
|\ \ \ | | | | | | | | | Extract common code from number helpers to new delegator method. | ||||
| * | | | Extract common code from number helpers to new delegator method. | Vipul A M | 2013-11-09 | 1 | -30/+13 |
| | | | | |||||
* | | | | Merge pull request #12813 from gaurish/patch-2 | Rafael Mendonça França | 2013-11-08 | 1 | -2/+1 |
|\ \ \ \ | | | | | | | | | | | fix broken url/formatting in Asset pipeline guide [ci skip] | ||||
| * | | | | :scissors: fix broken url [ci skip] | Gaurish Sharma | 2013-11-09 | 1 | -2/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #12814 from gaurish/enable-jruby19-again | Rafael Mendonça França | 2013-11-08 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | Start Running tests on Stable JRuby | ||||
| * | | | Start Running tests on Stable JRuby | Gaurish Sharma | 2013-11-09 | 1 | -2/+2 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for LOT of bugs have now landed in Jruby 1.7.6, thus we no longer need to run tests against the master. for broken tests that are still remaning: 1. If problem is in rails - we fix that test/code 2. if its a JRuby bug - we skip that test & file a bug report for jruby. | ||||
* | | | Mark broken test as pending | Rafael Mendonça França | 2013-11-08 | 2 | -0/+4 |
| | | | | | | | | | | | | This will avoid the broken window effect in our test suite | ||||
* | | | Remove more skip | Rafael Mendonça França | 2013-11-08 | 4 | -13/+7 |
| | | | |||||
* | | | Don't skip tests if we don't need to. | Rafael Mendonça França | 2013-11-08 | 30 | -1023/+966 |
| | | | | | | | | | | | | | | | | | | | | | We can conditional define the tests depending on the adapter or connection. Lets keep the skip for fail tests that need to be fixed. | ||||
* | | | removes redundant curly brackets in example code [ci skip] | Xavier Noria | 2013-11-08 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #12609 from corwinkelly/patch-1 | Xavier Noria | 2013-11-08 | 1 | -3/+1 |
|\ \ \ | | | | | | | | | Update workaround for "Outside the Scope of Strong Parameters" | ||||
| * | | | Fix undefined method error for NilClass | corwinkelly | 2013-10-23 | 1 | -1/+1 |
| | | | | | | | | | | | | Add .try to prevent undefined method error for NilClass. | ||||
| * | | | Update workaround for "Outside the Scope of Strong Parameters" | corwinkelly | 2013-10-22 | 1 | -3/+1 |
| | | | | | | | | | | | | The previous example of how to permit a hash of unknown keys used .tap, but had the side effect of logging an "Unpermitted parameters" message despite being a successful workaround. The proposed workaround is ever so slightly better, imo, because it won't result in an "Unpermitted parameters" message being logged. | ||||
* | | | | Merge pull request #12803 from arunagw/remove-unused-require | Rafael Mendonça França | 2013-11-08 | 1 | -2/+0 |
|\ \ \ \ | | | | | | | | | | | Removed unused require | ||||
| * | | | | Removed unused require | Arun Agrawal | 2013-11-08 | 1 | -2/+0 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #12292 from bf4/better_database_yaml | Xavier Noria | 2013-11-08 | 11 | -145/+85 |
|\ \ \ \ | |/ / / |/| | | | Extract common database defaults; better use of YAML | ||||
| * | | | Extract common database defaults; better use of YAML | Benjamin Fleischer | 2013-11-08 | 11 | -145/+85 |
|/ / / | |||||
* | | | Merge pull request #12791 from jasonayre/ja/fix_autoload_error | Rafael Mendonça França | 2013-11-07 | 2 | -0/+6 |
|\ \ \ | | | | | | | | | add autoload :TransactionState to fix Marshal.load issues | ||||
| * | | | revised changelog comment to be less than 80 chars | Jason Ayre | 2013-11-07 | 1 | -2/+2 |
| | | | | |||||
| * | | | add autoload :TransactionState to fix Marshal.load issues | Jason Ayre | 2013-11-07 | 2 | -0/+6 |
| | | | | |||||
* | | | | Merge pull request #12795 from arunagw/plateform-dependent-gems | Rafael Mendonça França | 2013-11-07 | 2 | -0/+16 |
|\ \ \ \ | | | | | | | | | | | Added platform dependent gems | ||||
| * | | | | Added platform dependent gems | Arun Agrawal | 2013-11-07 | 2 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #12475 If people are on rbx they will get the desired gem | ||||
* | | | | | Merge pull request #12800 from raysrashmi/warning-removed-ruby-trunk | Rafael Mendonça França | 2013-11-07 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Warning removed for ruby-head | ||||
| * | | | | Warning removed for ruby-head | Rashmi Yadav | 2013-11-07 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #12799 from arunagw/aa-av-test-fixes | Jeremy Kemper | 2013-11-07 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Don't call sub! since it may return nil. Reverts 4d15661. | ||||
| * | | | | sub! can return nil | Arun Agrawal | 2013-11-07 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | Revert "drop one more string allocation" This reverts commit 4d15661d6c46c86a62ee1fc358f4b3ef9dd9f2ea. | ||||
* | | | | Merge pull request #12798 from arunagw/plugin-generators-test | Guillermo Iguaran | 2013-11-07 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | Fixed plugin_generator test | ||||
| * | | | | Fixed plugin_generator test | Arun Agrawal | 2013-11-07 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Template replay needs to happen after bundle. As we are doing TemplateRecording in apply_rails_template. here are few commits for changes 8beb42cfbc41753ae4dbb91e16abcd1fb7d00356 9104702be61253f9448ca070a22fc86bb4299555 | ||||
* | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2013-11-07 | 10 | -37/+83 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Update Rails initialization guide to explain how bin/rails is executed | Alex Johnson | 2013-11-06 | 1 | -3/+36 |
| | | | | | |||||
| * | | | | refine usage docs of `store` in combination with `hstore` and `json`. | Yves Senn | 2013-11-06 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | refs #11561 #12700 | ||||
| * | | | | Fixed code syntax for config.ru [ci skip] | Rashmi Yadav | 2013-11-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | exists? is deprecated in ruby trunk [ci skip] | Rashmi Yadav | 2013-11-01 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | see here 4d4ff531b8807ee88a3fc46875c7e76f613956fb | ||||
| * | | | | Hstore and JSON fields are not supported with store | Robin Dupret | 2013-10-30 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The use of `store` on Hstore fields (for instance) is not needed because serialization aimed to interact with Ruby objects and not with provided field types | ||||
| * | | | | guides/rails_on_rack: Fix formatting of _Internal Middleware Stack_ section | Zachary Scott | 2013-10-28 | 1 | -23/+23 |
| | | | | |