aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* New CHANGELOG entries always on top [ci skip]Rafael Mendonça França2013-02-251-4/+4
|
* Merge pull request #9197 from yaotti/fix/overriden-attr-on-dupRafael Mendonça França2013-02-253-1/+13
|\ | | | | Fix: Overriding attributes on `dup` by default scopes
| * Do not override attributes on `dup` by default scopesHiroshige Umino2013-02-263-1/+13
|/
* Do not use --local option when installing the gemsRafael Mendonça França2013-02-251-3/+3
|
* Preparing for 4.0.0.beta1 releaseDavid Heinemeier Hansson2013-02-2515-15/+15
|
* Revert "Use sass compressor as the default CSS compressor"Guillermo Iguaran2013-02-251-1/+1
| | | | | | | This reverts commit 3eef1c7c5d0c4538efb9e061b6fe68011f0352b1. The css compressor should be set in sass-rails plugin. Check https://github.com/rails/sass-rails/commit/339529f9f6433047df6358c0439e6641cb74f045 for the fix.
* Use sass compressor as the default CSS compressorRafael Mendonça França2013-02-251-1/+1
| | | | | | | With the new sprockets-rails we need to explicitly set the CSS compressor. See https://github.com/rails/sprockets-rails#changes-from-rails-3x
* :scissors:Rafael Mendonça França2013-02-251-1/+1
|
* Merge pull request #8530 from dasch/dependency-trackersDavid Heinemeier Hansson2013-02-254-45/+146
|\ | | | | Custom dependency trackers for the template digestor
| * Register trackers on extensions, not handlersDaniel Schierbeck2013-02-203-11/+17
| |
| * Rename ErbTracker to ERBTrackerDaniel Schierbeck2013-02-201-2/+2
| |
| * Return an empty array if no tracker is foundDaniel Schierbeck2013-02-202-4/+16
| |
| * Use a thread safe hashDaniel Schierbeck2013-02-201-1/+3
| |
| * Allow registering custom dependency trackersDaniel Schierbeck2013-02-203-2/+54
| |
| * Extract dependency tracking from DigestorDaniel Schierbeck2013-02-202-44/+73
| |
* | Merge pull request #9072 from htanata/statisticsDavid Heinemeier Hansson2013-02-254-46/+394
|\ \ | | | | | | Improve `rake stats` for JavaScript and CoffeeScript
| * | Improve `rake stats` for JavaScript and CoffeeScript.Hendy Tanata2013-02-254-46/+394
| | | | | | | | | | | | Ignore block comments and calculates number of functions.
* | | Merge pull request #9412 from senny/clean_ar_changelogCarlos Antonio da Silva2013-02-251-3/+7
|\ \ \ | | | | | | | | Some minor AR changelog modifications [ci skip]
| * | | some minor AR changelog modifications [ci skip]Yves Senn2013-02-251-3/+7
|/ / /
* | | Merge pull request #9409 from wangjohn/adding_documentation_to_touchCarlos Antonio da Silva2013-02-251-0/+7
|\ \ \ | | | | | | | | Added documentation to touch throwing an error
| * | | Added documentation about how touch now throws an error when one trieswangjohn2013-02-251-0/+7
| | | | | | | | | | | | | | | | to use it on an unpersisted object.
* | | | Merge pull request #9390 from chris-baynes/datetime_sec_fractionAndrew White2013-02-253-1/+9
|\ \ \ \ | | | | | | | | | | Keep second fraction when DateTime#change is called.
| * | | | Keep second fraction when DateTime#change is called.Chris Baynes2013-02-253-1/+9
|/ / / /
* | | | Merge pull request #9411 from senny/add_auto_explain_removal_as_notable_changeXavier Noria2013-02-251-0/+2
|\ \ \ \ | | | | | | | | | | update 4.0 release notes to reflect the removal of auto explain.
| * | | | update 4.0 release notes to reflect the removal of auto explain.Yves Senn2013-02-251-0/+2
|/ / / /
* | | | Merge pull request #9246 from Noemj/update_prepared_statementsAaron Patterson2013-02-242-3/+26
|\ \ \ \ | |/ / / |/| | | Changed update to use prepared statements
| * | | Changed update_record to use prepared statements.Noemj2013-02-112-3/+26
| | | |
* | | | Merge pull request #9320 from wangjohn/touch_handling_on_new_instancesGuillermo Iguaran2013-02-243-0/+20
|\ \ \ \ | | | | | | | | | | Raising an ActiveRecordError when one tries to use touch on a new record object
| * | | | Raising an ActiveRecordError when one tries to use .touch(name) on a newwangjohn2013-02-253-0/+20
|/ / / / | | | | | | | | | | | | | | | | object that has not yet been persisted. This behavior follows the precedent set by update_columns.
* | / / Revert "Simplify code in AS json encoder"Guillermo Iguaran2013-02-251-8/+15
| |/ / |/| | | | | | | | | | | | | | This reverts commit 046e27a7338f2961c10e9d133e0e2229b51c2ba8. Check https://github.com/rails/rails/pull/8815#issuecomment-14026122 for details.
* | | Merge pull request #8815 from bogdan/simplified-to-json-argsSteve Klabnik2013-02-241-15/+8
|\ \ \ | | | | | | | | AS JSON encoder: remove monkey patch of Array
| * | | Simplify code in AS json encoderBogdan Gusiev2013-01-061-15/+8
| | | |
* | | | Improve AR changelog [ci skip]Carlos Antonio da Silva2013-02-241-2/+2
| | | |
* | | | Add more information to the CHANGELOG entry [ci skip]Rafael Mendonça França2013-02-241-0/+12
| | | |
* | | | Merge pull request #9403 from stopdropandrew/TimeWithZone#to_rRafael Mendonça França2013-02-243-0/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility. Closes #9404
| * | | | Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility.stopdropandrew2013-02-243-0/+19
| | | | |
* | | | | Remove warningRafael Mendonça França2013-02-241-1/+1
| | | | |
* | | | | Make explicit the method will raise an exceptionRafael Mendonça França2013-02-241-10/+10
|/ / / / | | | | | | | | | | | | Taking the wise advice of @carlosantoniodasilva
* | | | did a pass over the AS changelog [ci skip]Xavier Noria2013-02-241-55/+61
| | | |
* | | | Merge pull request #9391 from senny/8663_broken_hmt_ordering_with_includesRafael Mendonça França2013-02-243-2/+13
|\ \ \ \ | | | | | | | | | | don't apply invalid ordering when preloading hmt associations.
| * | | | don't apply invalid ordering when preloading hmt associations.Yves Senn2013-02-243-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #8663. When preloading a hmt association there two possible scenarios: 1.) preload with 2 queries: first hm association, then hmt with id IN () 2.) preload with join: hmt association is loaded with a join on the hm association The bug was happening in scenario 1.) with a normal order clause on the hmt association. The ordering was also applied when loading the hm association, which resulted in the error. This patch only applies the ordering the the hm-relation if we are performing a join (2). Otherwise the order will only appear in the second query (1).
* | | | | Merge pull request #9402 from senny/9356_update_guidesRafael Mendonça França2013-02-241-9/+7
|\ \ \ \ \ | | | | | | | | | | | | update the example for `after_commit` in the guides.
| * | | | | update the example for `after_commit` in the guides.Yves Senn2013-02-241-9/+7
| |/ / / / | | | | | | | | | | | | | | | This is a follow up to #9356.
* | | | | did a pass over the AM changelog [ci skip]Xavier Noria2013-02-241-15/+35
| | | | |
* | | | | Merge pull request #9401 from sikachu/master-remove-builder-optionRafael Mendonça França2013-02-2412-183/+7
|\ \ \ \ \ | |/ / / / |/| | | | Remove `--builder` option from `rails` command
| * | | | Remove `--builder` option from `rails` commandPrem Sichanugrist2013-02-2412-183/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ability to use a custom builder by passing `--builder` (or `-b`) has been removed. Consider using application template instead. See this guide for more detail: http://guides.rubyonrails.org/rails_application_templates.html
* | | | | Merge pull request #9400 from senny/remove_auto_explain_threshold_in_secondsXavier Noria2013-02-2414-223/+39
|\ \ \ \ \ | | | | | | | | | | | | remove config.auto_explain_threshold_in_seconds
| * | | | | remove AR auto-explain (config.auto_explain_threshold_in_seconds)Yves Senn2013-02-2414-223/+39
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We discussed that the auto explain feature is rarely used. This PR removes only the automatic explain. You can still display the explain output for any given relation using `ActiveRecord::Relation#explain`. As a side-effect this should also fix the connection problem during asset compilation (#9385). The auto explain initializer in the `ActiveRecord::Railtie` forced a connection.
* | | | | Use sprockets-rails 2.0.0.rc3 in new appsGuillermo Iguaran2013-02-242-2/+2
| | | | |
* | | | | Merge pull request #9399 from neerajdotname/7832-dependent-optionRafael Mendonça França2013-02-241-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Updated doc to clarify about update_all and delete_all
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 23:18:02 +0000