github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
26,995 Commits 34 Branches 105 Tags
59a408eb64729909aca15ef59291aea2cef951e2
Commit Graph

26995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Van Dyk
59a408eb64 datetime_select should work with -/+ infinity dates 2012-01-24 10:30:46 -08:00
kennyj
dc826f9977 Fix GH #4344. A defined callback in extended module is called too. 
Conflicts:

	activesupport/test/callbacks_test.rb
 2012-01-24 09:55:23 +01:00
Aaron Patterson
1a56a76153 work against 1-0-stable until a new journey is released 2012-01-23 17:23:13 -08:00
Aaron Patterson
3913b510b7 Added custom regexps to ASTs that have literal nodes on either side of 
symbol nodes.  Fixes #4585
 2012-01-23 17:21:29 -08:00
José Valim
b84046192b Merge pull request #4601 from carlosantoniodasilva/patch-1 
Add missing require to Array#wrap in generators action methods
 2012-01-23 08:18:48 -08:00
Vijay Dev
912f144190 test base64 encode and decode 2012-01-23 16:17:56 +05:30
Vijay Dev
70d81b319e Merge pull request #4611 from jviney/3-2-stable 
Fix ActiveSupport::Base64.decode64
 2012-01-23 02:42:17 -08:00
Jonathan Viney
44319eff4a The deprecated ActiveSupport::Base64.decode64 method should call ::Base64.decode64 not ::Base64.encode64 2012-01-23 21:37:10 +13:00
José Valim
ede01ce8b2 Support decimal{1,2} and decimal{1-2} and decimal{1.2} so it works fine with bash, zsh, etc, closes #4602 2012-01-22 15:58:58 +01:00
José Valim
334e5cab2a Merge pull request #4604 from ihid/3-2-stable 
3-2-stable: Fixed regression - unable to use a range as choices for form.select.
 2012-01-22 06:09:35 -08:00
Jeremy Walker
c6dcc3537c Allow form.select to accept ranges. 2012-01-22 13:39:15 +00:00
Carlos Antonio da Silva
d246da1603 Add missing require to Array#wrap in generators action methods 2012-01-22 10:08:58 -02:00
Jonathan Viney
9ab2904822 Fix $rails_rake_task global variable warning without replacing the value of $rails_rake_task if it is already set. 
Fixes #4591.

Signed-off-by: José Valim <jose.valim@gmail.com>
 2012-01-22 08:43:18 +01:00
José Valim
d5dde3734b Merge pull request #4586 from waseem/assert_with_no_deprecation_warnings 
Assert with no deprecation warnings activesupport tests.
 2012-01-21 12:23:46 -08:00
Waseem Ahmad
892c67018d Remove deprecation warning from console output when running 
activesupport tests.
 2012-01-22 01:45:32 +05:30
José Valim
a720e347e2 Merge pull request #4582 from kennyj/fix_4580 
Fix  GH #4580. Rails 3.2: uninitialized constant ActiveSupport::TaggedLogging::ERROR
 2012-01-21 12:03:32 -08:00
kennyj
caf78564c2 Fix GH #4580. Rails 3.2: uninitialized constant ActiveSupport::TaggedLogging::ERROR 2012-01-22 04:40:09 +09:00
Jonathan Roes
c70135807e document :raise option support for several helpers [ci skip] 2012-01-21 21:34:49 +05:30
Jon Leighton
fab664a8e9 Fix another race condition. 
From 2c667f69aa2daac5ee6c29ca9679616e2a71532a.

Thanks @pwnall for the heads-up.

Conflicts:

	activerecord/lib/active_record/core.rb
 2012-01-20 18:31:41 +00:00
David Heinemeier Hansson
f36dcaf488 Preparing for 3.2.0 release 2012-01-20 17:44:32 +01:00
Vijay Dev
6c656761ec update release notes [ci skip] 2012-01-20 00:47:14 +05:30
José Valim
5b906355f1 Update CHANGELOG 2012-01-19 19:49:13 +01:00
José Valim
08d6eb6824 Do not deprecate performed? 2012-01-19 19:45:22 +01:00
Vijay Dev
ff813dc385 add uglifier version info in the 'what to update' section 2012-01-19 23:36:50 +05:30
Vijay Dev
b259bf91ae fix duplicate ids for the headers [ci skip] 2012-01-19 23:36:45 +05:30
Vijay Dev
a0e439f2f8 document AR::Base#with_lock in release notes [ci skip] 2012-01-19 23:22:01 +05:30
Vijay Dev
6e311b93ad update the getting_started guide code [ci skip] 2012-01-19 23:13:19 +05:30
Aaron Patterson
4c5b73fef8 Merge pull request #4531 from exviva/pessimistic_with_lock 
Add ActiveRecord::Base#with_lock
 2012-01-19 09:39:20 -08:00
Simon Baird
00554568e0 Fix small typo in mail_to docs in url_helper.rb 2012-01-19 22:13:42 +05:30
Vijay Dev
c4508332c9 revising release notes [ci skip] 2012-01-19 22:12:22 +05:30
Fujimura Daisuke
ead04eeabd update release note: timestamps is non-null as default 2012-01-19 22:12:22 +05:30
Vijay Dev
c8b584f576 select doesn't take multiple arguments - fixes #4539 [ci skip] 
Didn't cherry pick the master commit because this one already had some
of the fixes made in master.
 2012-01-19 21:58:19 +05:30
Vijay Dev
2e6ca53da3 revise wording [ci skip] 2012-01-19 02:53:59 +05:30
Guillermo Iguaran
3bfbc455ff Adding Action Mailer section to 3.2 release notes 2012-01-19 02:53:57 +05:30
Guillermo Iguaran
683854918f Update Release Notes: sprockets-rails section should be inside of ActionPack section 2012-01-19 02:53:54 +05:30
Vijay Dev
f2af2acac7 Merge pull request #4525 from guilleiguaran/am-changelog-3-2-stable 
Update AM CHANGELOG
 2012-01-18 10:54:01 -08:00
Makoto Inoue
619731f2bb ActionController::UrlEncodedPairParser is deprecated. Replaced the url parsing example with Rack::Utils.parse_query 
- https://webrat.lighthouseapp.com/projects/10503/tickets/161-urlencodedpairparser-removed-in-edge-rails
 2012-01-19 00:14:52 +05:30
Guillermo Iguaran
939a84a40a Update AM CHANGELOG 2012-01-18 13:41:11 -05:00
Vijay Dev
0960eb97d9 updates to 3.2 release notes 2012-01-18 23:51:23 +05:30
José Valim
f74afd973d Merge pull request #4518 from guilleiguaran/silent-sprockets-logger-3-2-stable 
Silent Sprockets logger when config.assets.logger is set to false (3-2-stable)
 2012-01-18 05:20:20 -08:00
Guillermo Iguaran
ae7037eba0 Update CHANGELOG and docs for config.assets.logger 2012-01-18 08:06:48 -05:00
Guillermo Iguaran
02e4d7ffd4 Silent Sprockets logger when config.assets.logger is set to false 2012-01-18 07:55:49 -05:00
José Valim
2f52bd3082 Merge pull request #4498 from carlosantoniodasilva/action-controller-refactor-3-2 
Action controller refactor - deprecate Compatibility module
 2012-01-17 12:10:39 -08:00
Carlos Antonio da Silva
ed0f0ad35c Update changelog 2012-01-17 18:07:48 -02:00
Carlos Antonio da Silva
786a0b7475 Remove duplicated constant definition 
ActionController::ActionControllerError is already defined in
action_controller/metal/exceptions.
 2012-01-17 18:07:08 -02:00
Carlos Antonio da Silva
e5e87041ce Deprecate AC::UnknownError and AC::DoubleRenderError 
Use the constants AbstractController::ActionNotFound and
AbstractController::DoubleRenderError respectively instead.
 2012-01-17 18:07:08 -02:00
Carlos Antonio da Silva
9d4fd613a6 Add default charset config to ActionDispatch 2012-01-17 18:07:08 -02:00
Carlos Antonio da Silva
57be2cfa1e Deprecate default_charset= at controller level 2012-01-17 18:07:08 -02:00
Carlos Antonio da Silva
20baeece91 Add some deprecations for logic being removed in 4.0 2012-01-17 18:07:08 -02:00
Aaron Patterson
57f73a6bcf Merge pull request #4487 from sarenji/fix-reset-counters 
Fix bug where reset_counters resets the wrong counter cache.
 2012-01-17 10:23:56 -08:00