Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9414 from senny/9275_order_with_symbol_and_join | Rafael Mendonça França | 2013-02-26 | 4 | -2/+34 |
|\ | | | | | Expand order(:symbol) to "table".symbol to prevent broken queries on PG. | ||||
| * | Expand order(:symbol) to "table".symbol to prevent broken queries on PG. | Yves Senn | 2013-02-25 | 4 | -3/+35 |
| | | | | | | | | | | | | | | | | | | | | Fixes #9275. When `#order` is called with a Symbol this patch will prepend the quoted_table_name. Before the postgresql adapter failed to build queries containg a join and an order with a symbol. This expansion happens for all adapters. | ||||
* | | No need to send public methods | Akira Matsuda | 2013-02-26 | 3 | -3/+3 |
| | | |||||
* | | Merge pull request #9429 from frodsan/racc_jruby_incompatibility | Guillermo Iguaran | 2013-02-25 | 1 | -3/+3 |
|\ \ | | | | | | | JRuby does not support racc, include it only in ruby platform | ||||
| * | | JRuby does not support racc, include it only in ruby platform | Francesco Rodriguez | 2013-02-26 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #9419 from banyan/change-default-root-route-helper | Guillermo Iguaran | 2013-02-25 | 3 | -4/+4 |
|\ \ \ | |/ / |/| | | Change default root route helper | ||||
| * | | Change default root route helper | Kohei Hasegawa | 2013-02-26 | 3 | -4/+4 |
| | | | |||||
* | | | Apparently we can't get away from adding lib to the load path | José Valim | 2013-02-25 | 1 | -0/+1 |
| | | | |||||
* | | | Plugins can use a similar bootscript to Rails apps | José Valim | 2013-02-25 | 1 | -8/+3 |
| | | | |||||
* | | | Merge pull request #9425 from dickeyxxx/patch-1 | Rafael Mendonça França | 2013-02-25 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | small typo on upgrade guide | ||||
| * | | | small typo | Jeff Dickey | 2013-02-25 | 1 | -1/+1 |
|/ / / | | | | | | | small typo fix | ||||
* | | | Bundler 1.3.0 released. We prefer it for new binstub behavior. | Jeremy Kemper | 2013-02-25 | 1 | -1/+1 |
| | | | |||||
* | | | 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 |
|/ / / / |