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
23,009 Commits 34 Branches 105 Tags
09e431aa893bb1d08705381e2bfcd006de22a70e
Commit Graph

23009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Leighton
09e431aa89 Merge pull request #1318 from TheEmpty/master 
Resolve issue #534
 2011-05-26 12:54:38 -07:00
Mohammad Typaldos
ded7e35cb0 Removes a now needless test - via Github 2011-05-26 12:17:20 -07:00
José Valim
0731945e74 Merge pull request #1334 from bogdan/callback 
MassAssignmentSecurity: add ability to specify your own sanitizer
 2011-05-26 11:47:35 -07:00
José Valim
d341d16677 Merge pull request #1344 from jmileham/serialization_includes 
AR Serialization shouldn't fall back to base opts for includes
 2011-05-26 11:21:05 -07:00
John Mileham
043b624390 Don't merge base opts into includes when serializing ARs 
Conflicts:

	activerecord/lib/active_record/serialization.rb
 2011-05-26 11:40:57 -04:00
John Mileham
294e2a8c2e Failing test - JSON serialization shouldn't merge base opts into include opts. 2011-05-26 11:24:25 -04:00
Bogdan Gusiev
c7567c9a6d MassAssignmentSecurity: add ability to specify your own sanitizer 
Added an ability to specify your own behavior on mass assingment
protection, controlled by option:
ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer
 2011-05-26 15:58:43 +03:00
José Valim
5083d70f6f Merge pull request #1328 from flippingbits/cleanup_engine_generator 
Cleanup engine generator
 2011-05-26 03:44:14 -07:00
Stefan Sprenger
4686ace999 Use global namespace Rails 2011-05-26 12:06:17 +02:00
Stefan Sprenger
11862932ec Use plugin name consistently 2011-05-26 12:01:59 +02:00
José Valim
ec08bfc035 Merge pull request #1324 from dmathieu/no_error_on_invalid_format 
Don't raise an exception if the format isn't recognized
 2011-05-26 02:29:23 -07:00
dmathieu
16571f9c42 don't raise an exception if the format isn't recognized 
Fixed while traveling to heuruko
 2011-05-26 11:18:30 +02:00
José Valim
badc72f3e6 Merge pull request #1315 from ardavis/master 
Removed unnecessary space in application.rb
 2011-05-25 22:46:53 -07:00
Mohammad El-Abid
ec44763f03 Removes the restriction on primary key when joining in a habtm && test that it was properly removed 2011-05-26 00:54:51 -04:00
Aaron Patterson
bf9272b9d4 Merge pull request #1316 from guilleiguaran/railties-changelog 
Updating Railties changelog
 2011-05-25 17:32:40 -07:00
Guillermo Iguaran
433390de2d Updating Railties changelog 2011-05-25 18:49:17 -05:00
Andrew Davis
60ca8d9593 Added a space to the comment_if helper for formatting purposes 2011-05-25 19:18:29 -04:00
Andrew Davis
063229525f Accidentally added extra IDE files, removed them. 2011-05-25 19:04:15 -04:00
Andrew Davis
3b23759a74 Removed unnecessary space in application.rb for formatting 2011-05-25 19:03:29 -04:00
José Valim
9b6791870b Merge pull request #1312 from joshk/remove_active_support_deprecations 
Removed deprecated methods and related tests from ActiveSupport
 2011-05-25 14:55:04 -07:00
Josh Kalderimis
9cafc28874 Removed deprecated methods and related tests from ActiveSupport 2011-05-25 23:39:34 +02:00
José Valim
7fd0a6de84 Merge pull request #1311 from kuldarkrabbi/master 
action_view/template/handler.rb has been removed
 2011-05-25 14:15:00 -07:00
Kuldar Krabbi
9a6833378a action_view/template/handler has been removed 2011-05-25 16:59:04 -04:00
Xavier Noria
b7921f50e7 Merge branch 'master' of github.com:rails/rails 2011-05-25 22:49:23 +02:00
Xavier Noria
00e1d0832e Merge branch 'master' of git://github.com/lifo/docrails 
Conflicts:
	actionmailer/lib/action_mailer/base.rb
	activesupport/lib/active_support/core_ext/kernel/requires.rb
 2011-05-25 22:48:47 +02:00
Aaron Patterson
6b436c23a9 Merge pull request #1285 from joshk/remove_active_record_deprecations 
removed deprecated methods, and related tests, from ActiveRecord
 2011-05-25 13:48:35 -07:00
José Valim
d25b7c2eee Merge pull request #1305 from amatsuda/require_rdoc_task_fail2 
Ensure RDoc::Task exists even if 'rdoc/task' was not required
 2011-05-25 13:43:55 -07:00
José Valim
89d06eacf6 Merge pull request #1308 from vijaydev/fix-codestat-indent 
Minor indentation fix in code_statistics
 2011-05-25 13:38:37 -07:00
Lee Reilly
03f418370a Typo; changed 'Febuary' to 'February' 2011-05-25 13:15:59 -07:00
Lee Reilly
1d637d2f48 Typo; changed 'colour' to 'color' & 'analysed' to 'analyzed' 2011-05-25 13:15:18 -07:00
Lee Reilly
29ff12b738 Typo; changed 'enviroment' to 'environment' 2011-05-25 13:14:00 -07:00
Vijay Dev
2c29c40a0d prefer validates :x in place of validates_x_of 2011-05-26 00:31:29 +05:30
Vijay Dev
ffaefe2681 fixed minor errors 2011-05-26 00:16:09 +05:30
wycats
e144b3e3cf Renaming helper in the Rake task, but why is this needed in the first place? (paging JP) 2011-05-25 11:35:18 -07:00
Vijay Dev
548e5bafad fix indentation 2011-05-25 23:47:31 +05:30
Vijay Dev
492f60672c changes validates_format & numericality to newer syntax 2011-05-25 22:17:36 +05:30
Vijay Dev
f69d5cddf0 changes validates_inclusion & exclusion to newer syntax 2011-05-25 22:17:36 +05:30
Vijay Dev
34a05a701b changes validates_length_of to newer syntax 2011-05-25 22:17:36 +05:30
Vijay Dev
cc10dff1ad changes validates_confirmation_of to newer syntax 2011-05-25 22:17:36 +05:30
Vijay Dev
084750c2d0 changes validates_acceptance_of to newer syntax 2011-05-25 22:17:36 +05:30
Vijay Dev
deffc9d048 changes validates_uniqueness_of to newer syntax 2011-05-25 22:17:36 +05:30
Vijay Dev
45989b816e changes validates_presence_of to newer syntax 2011-05-25 22:17:36 +05:30
Vijay Dev
542cee3af6 fix incorrect textile syntax 2011-05-25 22:17:36 +05:30
Akira Matsuda
05adf524c6 Ensure RDoc::Task exists even if 'rdoc/task' was not required 2011-05-26 01:37:34 +09:00
Xavier Noria
ee46bb73d4 Merge pull request #1301 from amatsuda/require_rdoc_task_fail 
require 'rake/rdoctask' if failed to require 'rdoc/task'
 2011-05-25 08:26:09 -07:00
Akira Matsuda
24b28a2a0c require 'rake/rdoctask' if failed to require 'rdoc/task' 
fixes a regression introduced by b921679d0d
require 'rdoc/task' fails if the system RDoc version is below 2.4.2 (e.g. CRuby 1.8.7)
 2011-05-26 00:15:23 +09:00
José Valim
f116a4835b Merge pull request #1299 from cesario/mit-license 
Ensure MIT-LICENSE is included in all the gemspec's
 2011-05-25 06:42:46 -07:00
Franck Verrot
4633772a12 Add the MIT-LICENSE to the Active Support gemspec 2011-05-25 15:32:15 +02:00
Franck Verrot
85283f0592 Add the MIT-LICENSE to the Active Resource gemspec 2011-05-25 15:32:10 +02:00
Franck Verrot
64d977359d Add the MIT-LICENSE to the Active Record gemspec 2011-05-25 15:32:04 +02:00