mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
28,237 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

28237 Commits

Author SHA1 Message Date
José Valim b41ef0a448 Merge pull request #4866 from bogdan/terminate_after_callbacks 
AS::Callbacks#define_callbacks: add :terminate_after_callbacks option
 2012-02-04 02:53:47 -08:00
Xavier Noria 1e5cdbddfc let automatic EXPLAIN ignore CACHE notifications 2012-02-03 16:10:39 -08:00
Aaron Patterson 393f797be8 Merge pull request #4905 from herimedia/to-infinity-and-beyond 
Infinity should be a valid validates_length_of maximum
 2012-02-06 10:17:32 -08:00
Aaron Patterson 6342cdd6ac Merge pull request #4910 from sskirby/fixes_regression_in_postgres_template_support 
prevents the database.yml template option from being passed to PGConn
 2012-02-06 10:13:57 -08:00
Sean Kirby 9ed5a1c8f1 prevents the database.yml template option from being passed to PGConn 2012-02-06 11:19:13 -05:00
José Valim 6e054b16f4 Merge pull request #4908 from kennyj/fix_3864 
Fix url_for method's behavior. GH #3684.
 2012-02-06 08:01:07 -08:00
kennyj 837231a829 Fix url_for method's behavior when it is called with :controller option which starts with "/" from multiple nested controller. 
Closes #3864
 2012-02-07 00:45:01 +09:00
Niels Ganser 60dad828ae To infinity… and beyond! 
Allow infinite values for validates_length_of. Particularly useful
for prettily defining an open ended range such as

validates_length_of :human_stupidity, :within => 0..Float::INFINITY
 2012-02-06 12:58:32 +01:00
José Valim af7dafff81 Merge pull request #4900 from lest/patch-1 
allow mass-assign version attribute in AR::SchemaMigration
 2012-02-05 22:53:41 -08:00
Sergey Nartimov e3b3a25abf allow mass-assign version attribute in AR::SchemaMigration 2012-02-06 09:33:02 +03:00
Jeremy Kemper 007c41100b Note the ways #match may be called 2012-02-05 23:26:39 -07:00
Jeremy Kemper b8f2a43ce2 Revert "Deprecated multi args to http route methods" 
Too painful to lose the compact shorthand form!

This reverts commit e848c52535.

Conflicts:

	actionpack/lib/action_dispatch/routing/mapper.rb
 2012-02-05 23:22:49 -07:00
Jeremy Kemper 33514a173c Get ActiveRecord::TestCase back on its feet, despite deprecation. It requires SQLCounter which was moved to AR internal tests only. 2012-02-05 23:09:09 -07:00
José Valim 956fb811ce Merge pull request #4893 from bcardarella/mark_for_highlight 
Highlight defaults to HTML5 `mark` element
 2012-02-05 09:13:34 -08:00
Brian Cardarella e4915e1796 Highlight defaults to HTML5 `mark` element 2012-02-05 12:08:21 -05:00
Jeremy Kemper 681faad7f3 Merge pull request #4881 from al2o3cr/compatible_json_errors 
Make ActiveResource error parsing interoperate with ActionController. Closes #4881.
 2012-02-05 08:32:02 -08:00
José Valim d36cfe2244 Merge pull request #4892 from bkzl/master 
Display annotations from .coffee files in `rake notes`
 2012-02-05 08:02:35 -08:00
Bartlomiej Kozal dd8c6f0556 Display annotations from .coffee files in `rake notes` 2012-02-05 16:42:35 +01:00
Santiago Pastorino 09804fb704 Merge pull request #4891 from kennyj/fix_4883 
[master] Optional start_day argument for Time#all_week.
 2012-02-05 07:25:50 -08:00
kennyj 9abdabf185 Optional start_day argument for Time#all_week. 
Closes #4883
 2012-02-06 00:20:16 +09:00
José Valim b0d05f4bee Merge pull request #4888 from kennyj/fix_2982 
Add a testcase for non english filename. Related to #2982.
 2012-02-05 06:27:01 -08:00
kennyj 1ec5c2674f Add testcase for non english filename. Related to #2982. 2012-02-05 22:34:29 +09:00
José Valim bb4de3a54c Merge pull request #4886 from bogdan/callbacks_cleanup 
AS::Callbacks: remove unused code
 2012-02-05 04:45:59 -08:00
Bogdan Gusiev 24b75fc40c AS::Callbacks: remove unused code 2012-02-05 12:58:44 +02:00
José Valim a9bebaedb9 Merge pull request #4875 from sikachu/master-asset-url 
Add *_url helpers to get the full assets URL
 2012-02-05 00:46:07 -08:00
Prem Sichanugrist bcd3b870ce Add *_url helpers to get the full assets URL 
Adds `image_url`, `javascript_url`, `stylesheet_url`, `audio_url`,
`video_url`, and `font_url` to assets tag helper. These URL helpers will
return the full path to your assets. This is useful when you are going
to reference this asset from external host.
 2012-02-04 17:57:05 -05:00
Matt Jones 02859745cc add handling for backwards-compatibility and update documentation 2012-02-04 16:02:52 -06:00
Matt Jones 7c307c2da3 Merge remote-tracking branch 'odorcicd/fix_activeresource_json_errors' into compatible_json_errors 2012-02-04 13:41:12 -06:00
José Valim 20bc3d4aaa Clean up a bit default_response handling and cache format negotiation. 2012-02-04 16:00:02 +01:00
José Valim 776a3736e4 Merge pull request #4869 from sikachu/master-responder-fix 
Fix override API response bug in respond_with
 2012-02-04 06:49:26 -08:00
José Valim b1faa35b52 Merge pull request #4879 from kennyj/fix_4873 
Fix GH #4873. Allow swapping same class middleware.
 2012-02-04 06:31:59 -08:00
kennyj e7ec969895 Fix GH #4873. Allow swapping middleware of same class 2012-02-04 22:59:13 +09:00
Prem Sichanugrist 3def1c8edb Fix override API response bug in respond_with 
Default responder was only using the given respond block when user
requested for HTML format, or JSON/XML format with valid resource. This
fix the responder so that it will use the given block regardless of the
validity of the resource. Note that in this case you'll have to check
for object's validity by yourself in the controller.

Fixes #4796
 2012-02-03 14:15:51 -05:00
Bogdan Gusiev 7661955634 AS::Callbacks: :skip_after_callbacks_if_terminated option 2012-02-03 17:57:53 +02:00
José Valim d709b124d1 Merge pull request #4865 from bogdan/deprecate_per_key 
AC::Callbacks: remove usage of :per_key option from filters
 2012-02-03 06:23:00 -08:00
Vijay Dev 5325adc9ca Merge pull request #4863 from norman/unicode 
Added note about new Unicode version.
 2012-02-03 05:23:53 -08:00
Norman Clarke 27bf1b1c8e Added note about new Unicode version. 2012-02-03 10:20:25 -03:00
José Valim e22c506c0a Merge pull request #4862 from norman/unicode 
Update Unicode database to recently-released 6.1.
 2012-02-03 05:13:07 -08:00
Norman Clarke 66c04431d3 Update Unicode database to recently-released 6.1. 
http://www.geek.com/articles/geek-pick/unicode-6-1-released-complete-with-emoji-characters-and-a-pile-of-poo-2012022/
 2012-02-03 10:09:26 -03:00
José Valim 3395709d75 Merge pull request #4861 from arunagw/verbose_test_output 
Verbose output for tests.
 2012-02-03 05:08:46 -08:00
Arun Agrawal bfb84cfb3e Verbose output for tests. 
See #3892
 2012-02-03 08:01:24 -05:00
José Valim c5512946e0 Merge pull request #4860 from carlosantoniodasilva/generators-hide-namespace 
Add convenience method to hide a generator from the available ones
 2012-02-03 04:32:17 -08:00
Bogdan Gusiev 1c61f7e6cb AC::Callbacks: remove usage of :per_key option from filters 2012-02-03 14:27:15 +02:00
Carlos Antonio da Silva c6ef45d6c4 Add convenience method to hide a generator from the available ones 
It is usually useful to be able to hide a generator when running rails
generate command. Such generators might be used only to dry up
generators code and shouldn't be available to end users.
 2012-02-03 10:18:58 -02:00
Aaron Patterson 2abaa19e77 Merge pull request #4856 from ihid/store_null_bug 
Allow store to be a not null column.
 2012-02-02 12:07:28 -08:00
Jeremy Walker 58d10e2012 Allow store to be a not null column. 2012-02-02 18:57:15 +00:00
Aaron Patterson 203962d89e *args is already an array. :'( 2012-02-02 10:18:26 -08:00
Aaron Patterson cd3bdb388b Merge pull request #4853 from rafaelfranca/fix-build-again 
columns method doesn't have name argument
 2012-02-02 10:11:00 -08:00
Rafael Mendonça França 37ce852c51 columns method doesn't have name argument 2012-02-02 16:08:31 -02:00
Aaron Patterson 55686ae5c9 removed whitespace errors 💛💙💜❤️💚 2012-02-02 10:01:11 -08:00