aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #9425 from dickeyxxx/patch-1Rafael Mendonça França2013-02-251-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | small typo on upgrade guide
| * | | | small typoJeff Dickey2013-02-251-1/+1
|/ / / / | | | | | | | | small typo fix
* | | | Bundler 1.3.0 released. We prefer it for new binstub behavior.Jeremy Kemper2013-02-251-1/+1
| | | |
* | | | Bump i18n version to 0.6.2Guillermo Iguaran2013-02-251-1/+1
| | | |
* | | | Are was releaseRafael Mendonça França2013-02-252-3/+1
| | | |
* | | | Bump sass-rails and coffee-rails to 4.0.0.beta1 in GemfileGuillermo Iguaran2013-02-252-3/+3
| | | |
* | | | removes redundant requireXavier Noria2013-02-251-2/+0
| | | | | | | | | | | | | | | | It turns out this file is required in active_record.rb.
* | | | Merge pull request #9420 from robertomiranda/remove-sprockets-railsGuillermo Iguaran2013-02-251-1/+0
|\ \ \ \ | | | | | | | | | | Remove sprockets-rails from the Gemfile generator
| * | | | Remove sprockets-rails from the Gemfile generatorrobertomiranda2013-02-251-1/+0
| | | | |
* | | | | typoXavier Noria2013-02-251-1/+1
| | | | |
* | | | | AR loads activerecord-deprecated_finders, no need to add it to the GemfileXavier Noria2013-02-252-6/+7
|/ / / /
* | | | sprockets 2.0.0.rc3 is in rails gemspec alreadyGuillermo Iguaran2013-02-251-2/+0
| | | |
* | | | ar-deprecated_finders is already in the gemspecJosé Valim2013-02-251-2/+0
| | | |
* | | | I released 0.0.3 some time agoRafael Mendonça França2013-02-251-1/+1
| | | |
* | | | jquery-rails 2.2.1 was releasedRafael Mendonça França2013-02-251-1/+1
| | | |
* | | | Remove rack-test git dependencyJosé Valim2013-02-251-1/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | The dependency was introduced in this commit: 002713c64568114f3754799acc0723ea0d442f7a which has been released a long time ago
* | | 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
| | | | |