Commit Graph

30289 Commits

Author SHA1 Message Date
Michael Pearson
2054a17dd8 Changelog entry regarding mysql(2) STRICT_ALL_TABLES 2012-05-05 18:53:46 +10:00
Michael Pearson
7c4d331133 Add config option, rdoc, tests for mysql(2) STRICT_ALL_TABLES mode. 2012-05-05 18:53:45 +10:00
Piotr Sarnacki
acb39848ae Try to convert object passed to debug_hash to hash
SessionStore was recently changed to delegate to hash
object instead of inherit from it. Since we don't want
to extend SessionStore with every method implemented in
Hash, it's better to just convert any object passed to
debug_hash (which is also better as we don't require
to pass Hash instance there, it can be any object that
can be converted to Hash).
2012-05-05 00:49:53 -07:00
José Valim
d6e2c81cfe Merge pull request #6169 from marcandre/respond_to_missing
Respond to missing
2012-05-05 00:34:13 -07:00
Michael Pearson
4b905606e3 Default to 'strict mode' in MySQL 2012-05-05 17:17:04 +10:00
Michael Pearson
a9721d8941 Modify test schema.rb to use a VARCHAR rather than a TEXT when a default is required to keep MySQL happy. 2012-05-05 17:17:04 +10:00
Marc-Andre Lafortune
14762dc5ef Use respond_to_missing for TimeWithZone 2012-05-05 02:45:04 -04:00
Marc-Andre Lafortune
9bda37474e Use respond_to_missing? for Chars 2012-05-05 02:44:58 -04:00
Marc-Andre Lafortune
3ea70f985b Use respond_to_missing? for OrderedOptions 2012-05-05 02:43:41 -04:00
Piotr Sarnacki
2ce5e4fa6c Give more detailed instructions in script/rails in engine
closes #4894
2012-05-04 23:11:11 -07:00
Piotr Sarnacki
c5176023a0 Duplicate column_defaults properly (closes #6115) 2012-05-04 23:00:41 -07:00
Piotr Sarnacki
2ec6ef5dda Change unless + ! into if 2012-05-04 22:58:37 -07:00
Aaron Patterson
58950ee224 Merge pull request #3713 from kf8a/master
postgresql adapter should quote not a number and infinity correctly for float columns
2012-05-04 16:47:35 -07:00
Aaron Patterson
d5cc711307 need to dup the default options so that mutations will not impact us 2012-05-04 15:55:57 -07:00
Aaron Patterson
d4838fdcb2 make sure the superclass matches so load order does not matter 2012-05-04 15:55:56 -07:00
Jeremy Kemper
fecfd61c22 Merge pull request #6156 from mjtko/feature-beginning_of_hour
Beginning and end of hour support for Time and DateTime
2012-05-04 15:34:11 -07:00
Jeremy Kemper
db6a399c8a Merge pull request #6163 from carlosantoniodasilva/wrap-params-refactor
Use Hash#fetch instead of has_key? check
2012-05-04 14:00:42 -07:00
Andrew White
a8a9091d4a Merge pull request #6157 from mjtko/fix-activesupport-time_with_zone-tests
Enable misnamed time_with_timezone_tests in activesupport core_ext
2012-05-04 13:41:37 -07:00
Carlos Antonio da Silva
81f92cbc2b Use Hash#fetch instead of has_key? check 2012-05-04 16:51:17 -03:00
José Valim
7a093606f6 Merge pull request #4445 from nragaz/role_based_params_wrapping
specify a role for identifying accessible attributes when wrapping params
2012-05-04 21:45:32 +02:00
José Valim
2919fd8980 Merge pull request #5808 from avakhov/assert-template-layout-improve
Assert template layout improve
2012-05-04 12:39:51 -07:00
Alexey Vakhov
0d19a081ee Improve assert_template layout checking 2012-05-04 23:31:09 +04:00
Alexey Vakhov
4bd05a7bdc Fix assert_template :layout => nil assertion 2012-05-04 23:31:05 +04:00
Alexey Vakhov
df36c5f7ff Fix assert_template assertion with :layout option 2012-05-04 23:31:03 +04:00
Aaron Patterson
9ce057d8cc Merge pull request #6160 from carlosantoniodasilva/resource-route-canonical-action
Force given path to http methods in mapper to skip canonical action checking
2012-05-04 11:39:20 -07:00
Vijay Dev
3f46e7aae9 fix doc [ci skip] 2012-05-04 23:58:15 +05:30
Aaron Patterson
26e7678ab3 session creation methods to a module 2012-05-04 11:26:14 -07:00
Vijay Dev
db93c1c125 Merge pull request #6154 from shaliko/patch-1
Update documentation for button_to.
2012-05-04 11:26:03 -07:00
Carlos Antonio da Silva
d03aa104e0 Force given path to http methods in mapper to skip canonical action checking
This fixes the following scenario:

    resources :contacts do
      post 'new', action: 'new', on: :collection, as: :new
    end

Where the /new path is not generated because it's considered a canonical
action, part of the normal resource actions:

    new_contacts POST   /contacts(.:format)          contacts#new

Fixes #2999
2012-05-04 15:17:04 -03:00
Vijay Dev
319db7b189 update invalid partial error message as per 04202a3f8d66c0675eac41fbf63309f4be356e81 2012-05-04 23:45:27 +05:30
Vijay Dev
06631b8c6e Merge pull request #6159 from marcandre/fix_bad_partial_error_mess
Adjust error message for partial names starting with an uppercase letter...
2012-05-04 11:05:15 -07:00
Aaron Patterson
e2218b7ee5 create a request session in the cookie stores 2012-05-04 11:03:37 -07:00
Aaron Patterson
638d0020a2 create a request::session object in the memecache store middleware 2012-05-04 10:57:55 -07:00
Marc-Andre Lafortune
04202a3f8d Adjust error message for partial names starting with an uppercase letter. 2012-05-04 13:48:02 -04:00
Ernesto Tagwerker
c8e0571987 Added reference to I18n.localize, as discussed here:
https://github.com/rails/rails/issues/4027
2012-05-04 14:35:16 -03:00
Aaron Patterson
b13849de88 Merge branch 'master' into session
* master: (55 commits)
  extract deprecated dynamic methods
  Add some docs and changelog entry
  Allow overriding exception handling in threaded consumer
  Allow configuring a different queue consumer
  actually don't need to expand the aggregates at all
  #to_sym is unnecessary
  de-globalise method
  extract code from AR::Base
  clean up implementation of dynamic methods. use method compilation etc.
  Fix ActiveModel README example
  mention database mapping in getting started guide
  Remove vestiges of the http_only! config from configuring guide
  Remove content-length as well
  Make ActionController#head pass rack-link
  RouteSet: optimize routes generation when globbing is used
  Allows assert_redirected_to to accept a regular expression
  use extract_options!
  No need to force conversion to Symbol since case ensures it's already one.
  No need to work around 1.8 warnings anymore.
  Update command line guide
  ...
2012-05-04 10:14:10 -07:00
Kristian Freeman
7f536f9158 Play nice with some lint patterns 2012-05-04 09:56:07 -07:00
Mike Manewitz
544a10e428 Editing log levels to reflect this doc: http://api.rubyonrails.org/classes/ActiveSupport/BufferedLogger/Severity.html 2012-05-04 10:24:56 -05:00
Mark J. Titorenko
6223d72b52 enable tests for beginning_of_* and end_of_* within time zone tests; enable test for future_with_time_current_as_time_with_zone; fix beginning_of_month test. 2012-05-04 16:11:32 +01:00
Mark J. Titorenko
8c3f4bec1f added beginning_of_hour support to core_ext calculations for Time and DateTime 2012-05-04 16:01:57 +01:00
Shalva Usubov
42eda20cce Update documentation for button_to. 2012-05-04 17:36:42 +04:00
Jon Leighton
510cf0ad93 extract deprecated dynamic methods 2012-05-04 14:31:19 +01:00
José Valim
ffad3600ea Merge pull request #6153 from carlosantoniodasilva/queue-consumer
Configurable queue consumer
2012-05-04 05:44:21 -07:00
Vijay Dev
3d9673d8f6 Merge branch 'master' of github.com:lifo/docrails 2012-05-04 17:51:15 +05:30
Carlos Antonio da Silva
7a6116b633 Add some docs and changelog entry 2012-05-04 09:11:45 -03:00
Carlos Antonio da Silva
8fbf2e197f Allow overriding exception handling in threaded consumer 2012-05-04 09:11:44 -03:00
Carlos Antonio da Silva
1385388452 Allow configuring a different queue consumer
Also make sure to not use default queue consumer with custom queue
implementation. It is up to the new queue implementation to
start / shutdown the consumer.
2012-05-04 09:11:44 -03:00
Vijay Dev
b24f1ce138 Merge pull request #5650 from sekrett/master
Documentation fix: Change the example for habtm association to use proc according to changelog
2012-05-04 04:57:07 -07:00
Jon Leighton
d1729b917f actually don't need to expand the aggregates at all 2012-05-04 12:50:07 +01:00
Jon Leighton
780e8939c0 #to_sym is unnecessary 2012-05-04 12:50:07 +01:00