Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bump i18n version to 0.6.2 | Guillermo Iguaran | 2013-02-25 | 1 | -1/+1 |
| | |||||
* | Are was release | Rafael Mendonça França | 2013-02-25 | 2 | -3/+1 |
| | |||||
* | Bump sass-rails and coffee-rails to 4.0.0.beta1 in Gemfile | Guillermo Iguaran | 2013-02-25 | 2 | -3/+3 |
| | |||||
* | removes redundant require | Xavier Noria | 2013-02-25 | 1 | -2/+0 |
| | | | | It turns out this file is required in active_record.rb. | ||||
* | Merge pull request #9420 from robertomiranda/remove-sprockets-rails | Guillermo Iguaran | 2013-02-25 | 1 | -1/+0 |
|\ | | | | | Remove sprockets-rails from the Gemfile generator | ||||
| * | Remove sprockets-rails from the Gemfile generator | robertomiranda | 2013-02-25 | 1 | -1/+0 |
| | | |||||
* | | typo | Xavier Noria | 2013-02-25 | 1 | -1/+1 |
| | | |||||
* | | AR loads activerecord-deprecated_finders, no need to add it to the Gemfile | Xavier Noria | 2013-02-25 | 2 | -6/+7 |
|/ | |||||
* | sprockets 2.0.0.rc3 is in rails gemspec already | Guillermo Iguaran | 2013-02-25 | 1 | -2/+0 |
| | |||||
* | ar-deprecated_finders is already in the gemspec | José Valim | 2013-02-25 | 1 | -2/+0 |
| | |||||
* | I released 0.0.3 some time ago | Rafael Mendonça França | 2013-02-25 | 1 | -1/+1 |
| | |||||
* | jquery-rails 2.2.1 was released | Rafael Mendonça França | 2013-02-25 | 1 | -1/+1 |
| | |||||
* | Remove rack-test git dependency | José Valim | 2013-02-25 | 1 | -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ça | 2013-02-25 | 1 | -4/+4 |
| | |||||
* | Merge pull request #9197 from yaotti/fix/overriden-attr-on-dup | Rafael Mendonça França | 2013-02-25 | 3 | -1/+13 |
|\ | | | | | Fix: Overriding attributes on `dup` by default scopes | ||||
| * | Do not override attributes on `dup` by default scopes | Hiroshige Umino | 2013-02-26 | 3 | -1/+13 |
|/ | |||||
* | Do not use --local option when installing the gems | Rafael Mendonça França | 2013-02-25 | 1 | -3/+3 |
| | |||||
* | Preparing for 4.0.0.beta1 release | David Heinemeier Hansson | 2013-02-25 | 15 | -15/+15 |
| | |||||
* | Revert "Use sass compressor as the default CSS compressor" | Guillermo Iguaran | 2013-02-25 | 1 | -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 compressor | Rafael Mendonça França | 2013-02-25 | 1 | -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ça | 2013-02-25 | 1 | -1/+1 |
| | |||||
* | Merge pull request #8530 from dasch/dependency-trackers | David Heinemeier Hansson | 2013-02-25 | 4 | -45/+146 |
|\ | | | | | Custom dependency trackers for the template digestor | ||||
| * | Register trackers on extensions, not handlers | Daniel Schierbeck | 2013-02-20 | 3 | -11/+17 |
| | | |||||
| * | Rename ErbTracker to ERBTracker | Daniel Schierbeck | 2013-02-20 | 1 | -2/+2 |
| | | |||||
| * | Return an empty array if no tracker is found | Daniel Schierbeck | 2013-02-20 | 2 | -4/+16 |
| | | |||||
| * | Use a thread safe hash | Daniel Schierbeck | 2013-02-20 | 1 | -1/+3 |
| | | |||||
| * | Allow registering custom dependency trackers | Daniel Schierbeck | 2013-02-20 | 3 | -2/+54 |
| | | |||||
| * | Extract dependency tracking from Digestor | Daniel Schierbeck | 2013-02-20 | 2 | -44/+73 |
| | | |||||
* | | Merge pull request #9072 from htanata/statistics | David Heinemeier Hansson | 2013-02-25 | 4 | -46/+394 |
|\ \ | | | | | | | Improve `rake stats` for JavaScript and CoffeeScript | ||||
| * | | Improve `rake stats` for JavaScript and CoffeeScript. | Hendy Tanata | 2013-02-25 | 4 | -46/+394 |
| | | | | | | | | | | | | Ignore block comments and calculates number of functions. | ||||
* | | | Merge pull request #9412 from senny/clean_ar_changelog | Carlos Antonio da Silva | 2013-02-25 | 1 | -3/+7 |
|\ \ \ | | | | | | | | | Some minor AR changelog modifications [ci skip] | ||||
| * | | | some minor AR changelog modifications [ci skip] | Yves Senn | 2013-02-25 | 1 | -3/+7 |
|/ / / | |||||
* | | | Merge pull request #9409 from wangjohn/adding_documentation_to_touch | Carlos Antonio da Silva | 2013-02-25 | 1 | -0/+7 |
|\ \ \ | | | | | | | | | Added documentation to touch throwing an error | ||||
| * | | | Added documentation about how touch now throws an error when one tries | wangjohn | 2013-02-25 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | to use it on an unpersisted object. | ||||
* | | | | Merge pull request #9390 from chris-baynes/datetime_sec_fraction | Andrew White | 2013-02-25 | 3 | -1/+9 |
|\ \ \ \ | | | | | | | | | | | Keep second fraction when DateTime#change is called. | ||||
| * | | | | Keep second fraction when DateTime#change is called. | Chris Baynes | 2013-02-25 | 3 | -1/+9 |
|/ / / / | |||||
* | | | | Merge pull request #9411 from senny/add_auto_explain_removal_as_notable_change | Xavier Noria | 2013-02-25 | 1 | -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 Senn | 2013-02-25 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | Merge pull request #9246 from Noemj/update_prepared_statements | Aaron Patterson | 2013-02-24 | 2 | -3/+26 |
|\ \ \ \ | |/ / / |/| | | | Changed update to use prepared statements | ||||
| * | | | Changed update_record to use prepared statements. | Noemj | 2013-02-11 | 2 | -3/+26 |
| | | | | |||||
* | | | | Merge pull request #9320 from wangjohn/touch_handling_on_new_instances | Guillermo Iguaran | 2013-02-24 | 3 | -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 new | wangjohn | 2013-02-25 | 3 | -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 Iguaran | 2013-02-25 | 1 | -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-args | Steve Klabnik | 2013-02-24 | 1 | -15/+8 |
|\ \ \ | | | | | | | | | AS JSON encoder: remove monkey patch of Array | ||||
| * | | | Simplify code in AS json encoder | Bogdan Gusiev | 2013-01-06 | 1 | -15/+8 |
| | | | | |||||
* | | | | Improve AR changelog [ci skip] | Carlos Antonio da Silva | 2013-02-24 | 1 | -2/+2 |
| | | | | |||||
* | | | | Add more information to the CHANGELOG entry [ci skip] | Rafael Mendonça França | 2013-02-24 | 1 | -0/+12 |
| | | | | |||||
* | | | | Merge pull request #9403 from stopdropandrew/TimeWithZone#to_r | Rafael Mendonça França | 2013-02-24 | 3 | -0/+19 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility. Closes #9404 | ||||
| * | | | | Added `ActiveSupport::TimeWithZone#to_r` for `Time#at` compatibility. | stopdropandrew | 2013-02-24 | 3 | -0/+19 |
| | | | | | |||||
* | | | | | Remove warning | Rafael Mendonça França | 2013-02-24 | 1 | -1/+1 |
| | | | | |