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
27,074 Commits 34 Branches 105 Tags
995c076d34e87e52ec0f09697b9331cc021fce1b
Commit Graph

27074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guillermo Iguaran
995c076d34 Add branch to sass-rails and coffee-rails for apps generated with --dev or --edge options (3.2.x) 2012-02-06 13:32:42 -05:00
José Valim
ab44418881 Merge pull request #4908 from kennyj/fix_3864 
Fix url_for method's behavior. GH #3684.
 2012-02-06 17:03:42 +01:00
Santiago Pastorino
93f5361957 Merge pull request #4890 from kennyj/improvement_4883 
GH #4883. Optional start_day argument for Time#all_week
 2012-02-05 07:14:47 -08:00
kennyj
b0374018c2 GH #4883. Optional start_day argument for Time#all_week 2012-02-05 23:51:11 +09:00
José Valim
2bf2055f7a Clean up a bit default_response handling and cache format negotiation. 2012-02-04 16:01:01 +01:00
José Valim
44b9992c11 Merge pull request #4870 from sikachu/3-2-stable-responder-fix 
Fix override API response bug in respond_with
 2012-02-04 07:00:49 -08:00
José Valim
9cb0e12e46 Merge pull request #4879 from kennyj/fix_4873 
Fix GH #4873. Allow swapping same class middleware.
 2012-02-04 15:32:40 +01:00
Prem Sichanugrist
567ac65b42 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:26:34 -05:00
Aaron Patterson
9aa4c6d7ce Merge pull request #4868 from skult/3-2-stable 
Fix Issue #4819
 2012-02-03 09:10:59 -08:00
densya203
daa266536e Fix Issue #4819 
'uninitialized constant ActiveRecord::Deprecation in Rails3.2.1'

Just a typo of 'ActiveSupport::...'
 2012-02-04 00:51:08 +09:00
Aaron Patterson
4ca633e466 Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption 
Fix for SQLite binary data corrupter (to master branch)
 2012-02-02 09:16:06 -08:00
Jon Leighton
42dab646eb Merge pull request #4543 from jdelStrother/find_or_init 
Don't instantiate two objects in collection proxy / find_or_instantiate_by
 2012-02-01 23:19:25 +00:00
José Valim
780bf52085 Merge pull request #4827 from sikachu/3-2-stable-fix-plugin-new 
Fix plugin_new test failure from c8c84397
 2012-02-01 10:11:51 -08:00
Prem Sichanugrist
b673ca68f1 Fix plugin_new test failure from c8c84397 
`plugin_new` generator doesn't generate `sass-rails` in the Gemfile, so
you can't check for that.
 2012-02-01 13:09:33 -05:00
José Valim
0696a514bc Merge pull request #4822 from carlosantoniodasilva/strict-validation-3-2 
Generate strict validation error messages with attribute name (3-2-stable)
 2012-02-01 06:05:02 -08:00
Santiago Pastorino
21735d225d Merge pull request #4815 from kennyj/fix_4749 
Fix GH #4749. Remove branch options, because edge is not 3-2-stable.
 2012-02-01 06:03:21 -08:00
Carlos Antonio da Silva
91f8cf2264 Generate strict validation error messages with attribute name 
Backported from master.
 2012-02-01 11:55:07 -02:00
kennyj
c8c84397cd Fix GH #4749. Remove branch options, because edge is not 3-2-stable. 2012-02-01 15:12:05 +09:00
Santiago Pastorino
1444ec6c91 Merge pull request #4811 from rafaelfranca/3-2-stable-fix 
Fix broken build in 3-2-stable branch
 2012-01-31 17:54:26 -08:00
Rafael Mendonça França
f532cd1040 Fix broken tests added by 85c724d59 2012-01-31 23:39:29 -02:00
Jon Leighton
e1de54079b Improve deprecation message 2012-01-31 20:26:16 +00:00
Aaron Patterson
81f14a5433 Merge pull request #4735 from arton/master 
Re-launch assets:precompile task using original $0 if $0 is batch file so it works on Windows
 2012-01-31 11:00:17 -08:00
Aaron Patterson
60cb7d6af0 Merge pull request #4779 from bsodmike/bsodmike-3-2-stable 
Update comment in Gemfile re Unicorn (minor clarification)
 2012-01-31 10:36:22 -08:00
José Valim
bd93ba5b16 Merge pull request #4793 from kennyj/fix_4760 
[3-2-stable] Fix GH #4760. A Block was not evaluated.
 2012-01-31 07:09:56 -08:00
Jon Leighton
85c724d59e Merge pull request #4783 from gregolsen/ids_reader_fix 
ids_reader method fixed, test added to has_many association (for PostgreSQL)
 2012-01-31 13:51:09 +00:00
José Valim
7beb5a71f3 Merge pull request #4790 from marten/fix-require-deprecation-in-activesupport 
Fix Deprecation usage in ActiveSupport when requiring only parts of AS
 2012-01-31 05:29:11 -08:00
Marten Veldthuis
2380a2d76c Fix use of Deprecation without requiring active_support/deprecation in whiny nil 2012-01-31 14:19:59 +01:00
Marten Veldthuis
f3e1b21ca9 Fix use of Deprecation without requiring active_support/deprecation in message verifier 2012-01-31 14:19:59 +01:00
Marten Veldthuis
563be40c59 Fix use of Deprecation without requiring active_support/deprecation in ActiveSupport::Concern in Base64 2012-01-31 13:41:08 +01:00
Marten Veldthuis
cb46423c53 Fix use of Deprecation without requiring active_support/deprecation in ActiveSupport::Concern 2012-01-31 13:40:11 +01:00
kennyj
91700bfc2d Fix GH #4760. A Block was not evaluated. 2012-01-31 21:26:17 +09:00
José Valim
175cdd11f4 Merge pull request #4786 from lest/patch-2 
fix assets test in 3-2-stable
 2012-01-31 03:35:21 -08:00
Sergey Nartimov
cfea673135 fix assets test 2012-01-31 14:27:40 +03:00
Jon Leighton
b2955edcea Allow writing unknown attributes, but with a deprecation warning. Closes #4583. 2012-01-31 08:50:36 +00:00
Jon Leighton
0bfc504d9c Add workaround and deprecation if the inherited hook is not executed. Closes #4757. 2012-01-31 08:41:51 +00:00
Jon Leighton
c472843bbc Merge pull request #4763 from kennyj/fix_4754 
[MySQL] Fix GH #4754. Remove double-quote characters around PK when using sql_mode=ANSI_QUOTES
 2012-01-31 08:23:25 +00:00
Michael de Silva
93306be571 clarification to prevent confusing newbies; Passenger/Unicorn are app servers, Apache/Nginx are the web servers along with thin a la Heroku etc. 2012-01-31 09:59:38 +03:00
Xavier Noria
413790559c query cache instrumentation should included the bindings in the payload [closes #4750] 2012-01-30 13:48:05 -08:00
Vijay Dev
766e12aa7d fix typo [ci skip] 2012-01-30 23:45:55 +05:30
David Heinemeier Hansson
f78cb5583f Inline the prefix assignment so it doesnt look so daft 2012-01-27 20:43:49 +01:00
David Heinemeier Hansson
66b445c319 Revert "Fix expanding cache key for single element arrays" 
This reverts commit abe915f237.

This broke all existing keys and it's wrong anyway. The array is just there as a convenience option for building the string. It's intentional that [ "stuff"] and "stuff" generates the same key.
 2012-01-27 20:41:37 +01:00
José Valim
2e5ec3b399 Merge check box fixes from remote-tracking branch 'cantonio/checkbox-hidden-backport' into 3-2-stable 2012-01-27 13:15:52 +01:00
Damien Mathieu
defb751681 don't set the hidden checkbox value if it's nil 2012-01-27 10:06:49 -02:00
Tadas Tamošauskas
19be5ea877 check_box helper with :disabled => true generates disabled hidden field. fixes #1953 2012-01-27 10:06:44 -02:00
Jon Leighton
1c5bd8a33d Merge pull request #4715 from pwim/find-create-multi-args 
Fix regression from Rails 3.1
 2012-01-27 09:31:48 +00:00
Xavier Noria
8e6ef371c5 fixes whitespace in CHANGELOG entries 2012-01-26 15:46:47 -08:00
Xavier Noria
67b8fbca92 updating RAILS_VERSION 2012-01-26 14:54:02 -08:00
Xavier Noria
97e8d1d819 CHANGELOG revision for v3.2.1 2012-01-26 14:28:48 -08:00
José Valim
c134f24f8f Revert usage of safe constantize 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2012-01-26 20:52:56 +01:00
Alex Tambellini
6c367a0d78 safe_constantize should handle wrong constant name NameErrors Fixes #4710 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2012-01-26 20:52:51 +01:00