Commit Graph

26828 Commits

Author SHA1 Message Date
Uģis Ozols
bea4f9aa3f Remove unnecessary comma. 2011-12-29 23:39:06 +05:30
Aaron Patterson
f423bdc10b Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids
allow reorder to affect eager loading correctly
2011-12-28 17:04:23 -08:00
Aaron Patterson
80f2eeb138 Revert "Merge pull request #4196 from gazay/3-2-stable-marshalling"
This reverts commit df3701872d, reversing
changes made to a0fd9fb017.
2011-12-28 16:55:41 -08:00
Aaron Patterson
50af25ba87 last named route wins. fixes #4164
This differs from route recognition where first recognized route wins.
This will not be supported in Rails 4.0 so that route recognition and
generation rules are consistent.
2011-12-28 16:33:40 -08:00
Xavier Noria
7a80ac0162 app code in general wants Time.current, not Time.now 2011-12-28 23:47:31 +01:00
Jon Leighton
bbafe73d8f Revert "Further simplify singleton_class checking in class_attribute"
This reverts commit 520918aad9.

Reason: build failure
2011-12-28 18:45:28 +00:00
Aaron Patterson
df3701872d Merge pull request #4196 from gazay/3-2-stable-marshalling
3.2 stable marshalling
2011-12-28 10:10:36 -08:00
Santiago Pastorino
a0fd9fb017 Add CHANGELOG entry 2011-12-28 15:55:06 -02:00
Santiago Pastorino
2004a13130 Bump to rack 1.4.0 2011-12-28 15:53:08 -02:00
James Miller
520918aad9 Further simplify singleton_class checking in class_attribute 2011-12-28 09:47:36 -08:00
Xavier Noria
40cab62560 Merge pull request #4217 from tapajos/patch-2
Remove empty line
2011-12-28 07:01:21 -08:00
Marcos Tapajós
7767159a15 Remove empty line. 2011-12-28 12:57:20 -02:00
José Valim
d547761eb3 Merge pull request #4210 from tapajos/patch-1
Fix #4208
2011-12-28 00:32:36 -08:00
Marcos Tapajós
b3490d82ba Closes #4208 2011-12-27 20:31:29 -02:00
Alexey Gaziev
f7b1906ed7 Safe getting value from cache entry 2011-12-27 10:54:05 +08:00
Piotr Sarnacki
d7cfb63636 Correctly display rack apps with dynamic constraints in RoutesInspector
If you used dynamic constraint like that:

  scope :constraint => MyConstraint.new do
    mount RackApp => "/foo"
  end

routes were not displayed correctly when using `rake routes`.
This commit fixes it. If you want nice display of dynamic
constraints in `rake routes` output, please just override
to_s method in your constraint's class.
2011-12-26 11:54:27 +01:00
Vijay Dev
4cf40d04e4 add back the version info to the title in guides index page 2011-12-25 22:13:04 +05:30
Vijay Dev
68564eb2a1 Some fixes in rails guides generation
* Passing edge information to the views fixes the lack of the edge badge
and sets the appropriate welcome page on edgeguides.rubyonrails.org.
* Changes in the welcome message to hyper link the rails tree based on
the version.
* Mention the Amazon url from where kindlegen can be downloaded.
2011-12-25 20:45:27 +05:30
Vijay Dev
7a3121b0f2 fix kindle apps link in edge guides index 2011-12-25 19:40:52 +05:30
Michael Pearson
51fd3f37d9 Mip Earson -> Michael Pearson in changelog. 2011-12-25 19:40:52 +05:30
Xavier Noria
7ec847336f registers guide generation for the Kindle and Kindle apps in the Changelog 2011-12-25 04:13:28 -08:00
Xavier Noria
d6d561eed9 download guides for the Kindle and Kindle apps from the home page 2011-12-25 04:10:21 -08:00
Xavier Noria
4ae1cdd36b guides generation for the Kindle looking good now [Mip Earson & Xavier Noria] 2011-12-25 04:10:11 -08:00
Aaron Patterson
0daf80a8a6 Merge pull request #4175 from kuroda/3-2-stable
Reconnect to the first database after db:create
2011-12-24 20:59:05 -08:00
Tsutomu Kuroda
38bc917bb5 Reconnect to the first database after db:create
Otherwise, the schema and seed will be loaded onto the
test database.
2011-12-25 13:15:32 +09:00
Xavier Noria
69cc645c70 (draft) guides for the Kindle and Kindle apps [Mip Earson & Xavier Noria] 2011-12-24 17:33:18 -08:00
José Valim
bea3524e3f Last attempt to fix 1.8.7 tests. 2011-12-24 22:00:40 +01:00
Aaron Patterson
a410a9c8f7 avoid deprecation warnings when running AR tests 2011-12-24 10:43:23 -07:00
Aaron Patterson
b590fe4892 delegating and deprecating logger#silence. fixes #4159 2011-12-24 10:34:54 -07:00
José Valim
0e8cbbe7d5 assert_not_match -> assert_no_match. 2011-12-24 17:05:12 +01:00
Vijay Dev
929bfb8bdc add latest changes to 3.2 release notes 2011-12-24 20:41:36 +05:30
Vijay Dev
853439c2bd minor edits in caching guide 2011-12-24 17:38:23 +05:30
José Valim
1db5f4e9ad Fix regexp intervals. 2011-12-24 12:53:27 +01:00
José Valim
fc4299805e Update CHANGELOGs. 2011-12-24 10:52:45 +01:00
José Valim
557014d45a Tidy up migration types. 2011-12-24 10:52:45 +01:00
Dmitrii Samoilov
7f5b51686c added ability to specify from cli when generating a model/migration whether particular property should be an index like this 'rails g model person name:string:index profile:string' 2011-12-24 10:52:45 +01:00
José Valim
c4ef3d34ee Remove unecessary config_accessors. 2011-12-24 10:52:45 +01:00
José Valim
ba868929d3 Provide a class optin for page_cache_compression. 2011-12-24 10:52:45 +01:00
Andrey A.I. Sitnik
754823dd66 Gzip files on page caching
Signed-off-by: José Valim <jose.valim@gmail.com>
2011-12-24 10:52:45 +01:00
Jeremy Kemper
684448b0c6 Remove broken #compute_source_path 2011-12-23 18:00:01 -07:00
Jon Leighton
0a2e37975d Fix situation where id method didn't get defined causing postgres to fail 2011-12-23 21:12:37 +00:00
Vijay Dev
4a86708e29 Rails 3.2 Release Notes 2011-12-24 00:59:36 +05:30
Jon Leighton
9d9440f686 Doh, remove debugging line 2011-12-23 18:25:30 +00:00
Jon Leighton
7bb754eaed Fix #4046. 2011-12-23 18:22:44 +00:00
Alvaro Bautista
6b9ab88a48 serialize fails on subclass 2011-12-23 18:22:42 +00:00
Xavier Noria
824334c15c removes Enumerable#pluck from the AS guide 2011-12-23 09:50:50 +01:00
José Valim
35ded6fd08 Merge pull request #4141 from arunagw/fix_build
Fix build 3-2-stable
2011-12-22 23:08:19 -08:00
Jon Leighton
96c38eca23 Fix build when IM=true 2011-12-23 12:00:37 +05:30
Aaron Patterson
5f2bfce9e0 adding an integration test for splat regexp substitutions. fixes #4138 2011-12-22 18:53:09 -07:00
Aaron Patterson
a32d3d0ad9 Adding an integration test. Fixes #4136 2011-12-22 18:04:59 -07:00