aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12834 from dredozubov/has_one_association_replacementYves Senn2013-11-113-4/+26
|\ | | | | Fixes problem with replacing has_one association record with itself
| * Fixes problem with replacing has_one association record with itselfDenis Redozubov2013-11-113-4/+26
| |
* | A tiny grammatical fixAkira Matsuda2013-11-111-1/+1
| | | | | | | | [ci skip]
* | Merge pull request #12844 from ↵Rafael Mendonça França2013-11-111-0/+1
|\ \ | | | | | | | | | | | | akalyaev/bugfix/12835-autoload-change-column-definition autoload ChangeColumnDefinition (Fixes #12835)
| * | autoload ChangeColumnDefinition (Fixes #12835)Anton Kalyaev2013-11-111-0/+1
| | |
* | | Merge pull request #12843 from DeltaKilo/css_fixRafael Mendonça França2013-11-118-0/+20
|\ \ \ | | | | | | | | Fix missing line and shadow on static error pages [ci skip]
| * | | Fix missing line and shadow on static error pages [ci skip]Dmitry Korotkov2013-11-118-0/+20
| |/ /
* | | Merge pull request #12842 from kuldeepaggarwal/array_splitGuillermo Iguaran2013-11-111-3/+3
|\ \ \ | | | | | | | | Speed up Array#split when block is passed
| * | | Speed up Array#splitKD2013-11-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 2.0.0p247 Rehearsal --------------------------------------- old 10.670000 0.150000 10.820000 ( 10.822651) new 8.520000 0.050000 8.570000 ( 8.571825) ----------------------------- total: 19.390000sec user system total real old 10.620000 0.170000 10.790000 ( 10.790409) new 8.570000 0.110000 8.680000 ( 8.686051)
* | | | Merge pull request #12841 from kuldeepaggarwal/in-group-documentationYves Senn2013-11-101-1/+1
|\ \ \ \ | |_|/ / |/| | | Array#in_groups: documentation updated [ci skip]
| * | | Array#in_groups: documentation updatedKD2013-11-111-1/+1
| | | |
* | | | Merge pull request #12839 from kuldeepaggarwal/array_splitGuillermo Iguaran2013-11-102-8/+14
|\ \ \ \ | | |/ / | |/| | Array#split preserving the calling array
| * | | Array#split preserving the calling arrayKD2013-11-112-8/+14
| |/ /
* | | Merge pull request #12838 from strzalek/remove_mime_type_order_varGuillermo Iguaran2013-11-101-4/+3
|\ \ \ | | | | | | | | Remove @order attribute from collector
| * | | Remove order attribute from collectorLukasz Strzalkowski2013-11-101-4/+3
| | | | | | | | | | | | | | | | Ruby 1.8 legacy. Since 1.9 hash preserves insertion order. No need for additional array to achieve this
* | | | Merge pull request #12740 from gaurish/patch-1Rafael Mendonça França2013-11-101-2/+4
|\ \ \ \ | | | | | | | | | | Improve Errors when Controller Name or Action isn't specfied
| * | | | Improve Errors when Controller Name or Action isn't specfiedGaurish Sharma2013-11-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These errors occur when, there routes are wrongly defined. example, the following line would cause a missing :action error root "welcomeindex" Mostly beginners are expected to hit these errors, so lets improve the error message a bit to make their learning experience bit better.
* | | | | Merge pull request #12749 from iantropov/issue_5303Rafael Mendonça França2013-11-101-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | Add test for ActiveRecord::Relation YAML serialization, for #5303 issue
| * | | | Add test for ActiveRecord::Relation YAML serialization, for #5303 issueIvan Antropov2013-11-031-0/+4
| | | | |
* | | | | Merge pull request #10826 from sferik/update_tzinfoAndrew White2013-11-102-1/+6
|\ \ \ \ \ | | |_|_|/ | |/| | | Update tzinfo
| * | | | Update tzinfo dependency to ~> 1.1Erik Michaels-Ober2013-11-102-1/+6
|/ / / / | | | | | | | | | | | | Include the tzinfo-data in the generated Gemfile on Windows.
* | | / Use the method provided by minitest to make tests order dependentGuillermo Iguaran2013-11-091-4/+2
| |_|/ |/| |
* | | use complete Relation API and not only `Model.all.merge!`.Yves Senn2013-11-091-88/+83
| | |
* | | Fixed minor typoJens Dahl Møllerhøj2013-11-091-1/+1
| | | | | | | | | | | | | | | | | | instead of 'rake test' as shortcut, use 'rake'. Closes #12780 [ci skip]
* | | Change array check for better aesthetics / reading the codeCarlos Antonio da Silva2013-11-091-1/+1
| | |
* | | Make the method name the first argumentRafael Mendonça França2013-11-091-7/+7
| | | | | | | | | | | | | | | This is the only argument that changes over the method calls so it is better to it be the first one
* | | Drop one more string allocationRafael Mendonça França2013-11-091-1/+3
| | |
* | | Merge pull request #12821 from arunagw/aa-removed-missleading-messageYves Senn2013-11-092-2/+2
|\ \ \ | | | | | | | | clarified missleading message
| * | | Changed message for Model.inspectArun Agrawal2013-11-092-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 Senn2013-11-091-3/+4
| | | |
* | | | Require the top file and autoload Base classRafael Mendonça França2013-11-093-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 Senn2013-11-091-0/+2
| | | | | | | | | | | | | | | | | | | | This is a follow up to: 97f0d9a0dd12e7ad634815eecfeff866f64aad92 This change is also related to: df0edafac9eb47cd971970a9e7b13a3eaddf214e
* | | | Document the bind returnRafael Mendonça França2013-11-091-0/+3
| | | |
* | | | Avoid shot circuit return.Rafael Mendonça França2013-11-091-8/+20
| | | | | | | | | | | | | | | | This will make the conditional and to code clear
* | | | Improve changelogs formatting [ci skip]Carlos Antonio da Silva2013-11-093-22/+22
| | | |
* | | | Don't use Active Support where we don't need toRafael Mendonça França2013-11-093-3/+3
| | | |
* | | | Fix typo in AR store docs [ci skip]Carlos Antonio da Silva2013-11-091-1/+1
|/ / /
* | | Merge pull request #12760 from pseidemann/masterYves Senn2013-11-093-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 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
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 19:58:16 +0000