aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | fix simple_format escapes own output when sanitize is set to truepseidemann2013-11-083-2/+11
| | | | |
* | | | | log bind variables after they were type casted.Yves Senn2013-11-095-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-testRafael Mendonça França2013-11-081-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Skip test which is broken on jruby
| * | | | | Skip test which is broken on jrubyGaurish Sharma2013-11-091-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_helperRafael Mendonça França2013-11-081-30/+13
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Extract common code from number helpers to new delegator method.
| * | | | | Extract common code from number helpers to new delegator method.Vipul A M2013-11-091-30/+13
| | | | | |
* | | | | | Merge pull request #12813 from gaurish/patch-2Rafael Mendonça França2013-11-081-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix broken url/formatting in Asset pipeline guide [ci skip]
| * | | | | | :scissors: fix broken url [ci skip]Gaurish Sharma2013-11-091-2/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #12814 from gaurish/enable-jruby19-againRafael Mendonça França2013-11-081-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Start Running tests on Stable JRuby
| * | | | | Start Running tests on Stable JRubyGaurish Sharma2013-11-091-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 pendingRafael Mendonça França2013-11-082-0/+4
| | | | | | | | | | | | | | | | | | | | This will avoid the broken window effect in our test suite
* | | | | Remove more skipRafael Mendonça França2013-11-084-13/+7
| | | | |
* | | | | Don't skip tests if we don't need to.Rafael Mendonça França2013-11-0830-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 Noria2013-11-081-1/+1
| | | | |
* | | | | Merge pull request #12609 from corwinkelly/patch-1Xavier Noria2013-11-081-3/+1
|\ \ \ \ \ | | | | | | | | | | | | Update workaround for "Outside the Scope of Strong Parameters"
| * | | | | Fix undefined method error for NilClasscorwinkelly2013-10-231-1/+1
| | | | | | | | | | | | | | | | | | Add .try to prevent undefined method error for NilClass.
| * | | | | Update workaround for "Outside the Scope of Strong Parameters" corwinkelly2013-10-221-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-requireRafael Mendonça França2013-11-081-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removed unused require
| * | | | | | Removed unused requireArun Agrawal2013-11-081-2/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #12292 from bf4/better_database_yamlXavier Noria2013-11-0811-145/+85
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Extract common database defaults; better use of YAML
| * | | | | Extract common database defaults; better use of YAMLBenjamin Fleischer2013-11-0811-145/+85
|/ / / / /
* | | | | Merge pull request #12791 from jasonayre/ja/fix_autoload_errorRafael Mendonça França2013-11-072-0/+6
|\ \ \ \ \ | | | | | | | | | | | | add autoload :TransactionState to fix Marshal.load issues
| * | | | | revised changelog comment to be less than 80 charsJason Ayre2013-11-071-2/+2
| | | | | |
| * | | | | add autoload :TransactionState to fix Marshal.load issuesJason Ayre2013-11-072-0/+6
| | | | | |
* | | | | | Merge pull request #12795 from arunagw/plateform-dependent-gemsRafael Mendonça França2013-11-072-0/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added platform dependent gems
| * | | | | | Added platform dependent gemsArun Agrawal2013-11-072-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #12475 If people are on rbx they will get the desired gem
* | | | | | | Merge pull request #12800 from raysrashmi/warning-removed-ruby-trunkRafael Mendonça França2013-11-071-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Warning removed for ruby-head
| * | | | | | Warning removed for ruby-headRashmi Yadav2013-11-071-1/+1
|/ / / / / /
* | | | | | Merge pull request #12799 from arunagw/aa-av-test-fixesJeremy Kemper2013-11-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't call sub! since it may return nil. Reverts 4d15661.
| * | | | | | sub! can return nilArun Agrawal2013-11-071-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "drop one more string allocation" This reverts commit 4d15661d6c46c86a62ee1fc358f4b3ef9dd9f2ea.
* | | | | | Merge pull request #12798 from arunagw/plugin-generators-testGuillermo Iguaran2013-11-071-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed plugin_generator test
| * | | | | | Fixed plugin_generator testArun Agrawal2013-11-071-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/docrailsVijay Dev2013-11-0710-37/+83
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update Rails initialization guide to explain how bin/rails is executedAlex Johnson2013-11-061-3/+36
| | | | | | |
| * | | | | | refine usage docs of `store` in combination with `hstore` and `json`.Yves Senn2013-11-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | refs #11561 #12700
| * | | | | | Fixed code syntax for config.ru [ci skip]Rashmi Yadav2013-11-041-1/+1
| | | | | | |
| * | | | | | exists? is deprecated in ruby trunk [ci skip]Rashmi Yadav2013-11-012-4/+4
| | | | | | | | | | | | | | | | | | | | | see here 4d4ff531b8807ee88a3fc46875c7e76f613956fb
| * | | | | | Hstore and JSON fields are not supported with storeRobin Dupret2013-10-301-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_ sectionZachary Scott2013-10-281-23/+23
| | | | | | |
| * | | | | | fix typo introduced when searching in markdown document with vimDamien Mathieu2013-10-241-14/+14
| | | | | | |
| * | | | | | rephrase the overriding views part about the view pathDamien Mathieu2013-10-241-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See rails/rails#12608
| * | | | | | Fixed URL link to rendered_component plugin [ci skip]Harshad Sabne2013-10-231-1/+1
| | | | | | |
| * | | | | | warning about saving models with dirty attributesDamien Mathieu2013-10-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See #8328
| * | | | | | Update 4_0_release_notes.mdHarshad Sabne2013-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | | Code Highlighted
| * | | | | | Fixes typoJay Hayes2013-10-201-1/+1
| | | | | | |
| * | | | | | Update 3_2_release_notes.mdHarshad Sabne2013-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | Code style adherence
| * | | | | | Update I18n guide to note the additional features of the `translate` view helperJay Hayes2013-10-191-1/+7
| | | | | | |
| * | | | | | Updated 3.2.x link [ci skip]Rashmi Yadav2013-10-181-1/+1
| | | | | | |
* | | | | | | Merge pull request #12228 from ersatzryan/standardize-json-time-formatsAndrew White2013-11-075-7/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Standardize all JSON encoded times to use 3 decimal fractional seconds
| * | | | | | Standardize all JSON encoded times to use 3 decimal fractional secondsRyan Glover2013-11-075-7/+12
|/ / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 03:49:01 +0000