1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Commit graph

16 commits

Author SHA1 Message Date
Yehuda Katz
d0ace15c01 Updated for Rack 1.0 2009-04-25 12:33:14 -07:00
Pratik Naik
d7d93cdb62 Fix nginx config in ci setup notes [Chad Woolley] [#2290 state:resolved] 2009-04-21 17:31:26 +01:00
Carl Lerche & Yehuda Katz
906aebceed Bring abstract_controller up to date with rails/master
Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list
of commits that could not be applied cleanly or are obviated with the
abstract_controller refactor. They all need to be revisited to ensure
that fixes made in 2.3 do not reappear in 3.0:

2259ecf368
AR not available
  * This will be reimplemented with ActionORM or equivalent

06182ea02e
implicitly rendering a js response should not use the default layout
[#1844 state:resolved]
  * This will be handled generically

893e9eb995
Improve view rendering performance in development mode and reinstate
template recompiling in production [#1909 state:resolved]
  * We will need to reimplement rails-dev-boost on top of the refactor;
    the changes here are very implementation specific and cannot be
    cleanly applied. The following commits are implicated:

      199e750d46
      3942cb406e
      f8ea9f85d4
      e3b166aab3
      ae9f258e03
      44423126c6

0cb020b4d6
workaround for picking layouts based on wrong view_paths
[#1974 state:resolved]
  * The specifics of this commit no longer apply. Since it is a two-line
    commit, we will reimplement this change.

8c5cc66a83
make action_controller/layouts pick templates from the current instance's
view_paths instead of the class view_paths [#1974 state:resolved]
  * This does not apply at all. It should be trivial to apply the feature
    to the reimplemented ActionController::Base.

87e8b16246
fix HTML fallback for explicit templates [#2052 state:resolved]
  * There were a number of patches related to this that simply compounded
    each other. Basically none of them apply cleanly, and the underlying
    issue needs to be revisited. After discussing the underlying problem
    with Koz, we will defer these fixes for further discussion.
2009-04-13 15:18:45 -07:00
Jeremy Kemper
922c528d42 Ruby 1.9 compat: use String#each_line instead of #each 2009-02-04 09:29:00 -08:00
Jeremy Kemper
aa6c7185ff Update ci config to use mocha 0.9.5 2009-02-03 18:45:23 -08:00
Yehuda Katz
3030bc90c9 Merge commit 'rails/3-0-unstable'
Conflicts:

	actionpack/lib/action_controller/base.rb
	actionpack/lib/action_dispatch/http/mime_type.rb
	actionpack/lib/action_dispatch/http/request.rb
	actionpack/lib/action_view/base.rb
	actionpack/lib/action_view/paths.rb
	actionpack/test/controller/session/cookie_store_test.rb
	actionpack/test/dispatch/rack_test.rb
	actionpack/test/dispatch/request_test.rb
2009-01-30 11:30:27 -08:00
Michael Koziarski
feed7b4cfd Move to use pg instead of postgres on the CI server 2009-01-29 17:07:29 +13:00
Michael Koziarski
2f92313324 Spam people with commit rights on test failures. 2009-01-07 18:18:00 +13:00
Mike Gunderloy
e57cb2629a Update CI configuration to reflect latest gems. 2009-01-07 16:59:06 +13:00
Mike Gunderloy
19818eb0ea Update CI configuration to reflect latest gems. 2009-01-07 16:42:53 +13:00
Michael Koziarski
9c01d3cead Spam more people, the list is next 2008-11-18 20:52:07 +01:00
Michael Koziarski
bb557b44e9 Be more careful 2008-08-26 12:21:48 +02:00
Michael Koziarski
86bf279b89 Re enable CI for postgresql 2008-08-26 12:14:07 +02:00
Chad Woolley
289e3b9072 use double quotes 2008-08-26 09:40:19 +02:00
Chad Woolley
fb20d6f09d properly reference geminstaller config under ci dir 2008-08-25 10:34:01 +02:00
Chad Woolley
337b043c93 Include the CI configuration and setup instructions.
This should make it easy to set up your own copy of the CI environment, and easier for us to keep ours running.
2008-08-24 16:27:20 +02:00