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,120 Commits 34 Branches 105 Tags
4eff6bc6dfeea3eed5d92af66bd73e6a2cb9b09f
Commit Graph

27120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santiago Pastorino
4eff6bc6df Restore lookup formats to the previous value after searching for the failing view 2012-02-21 14:55:52 -02:00
Santiago Pastorino
b1229685c4 Add CHANGELOG entry 2012-02-21 13:23:47 -02:00
Santiago Pastorino
c4265914fb Merge pull request #5106 from kennyj/fix_warnings_20120210 
[3-2-stable] Fix some warnings
 2012-02-21 03:17:41 -08:00
kennyj
39d4617033 Fix some warnings on 3-2-stable 2012-02-21 12:43:41 +09:00
Santiago Pastorino
b80d8f7111 Fix a failing test 2012-02-20 18:11:18 -02:00
Santiago Pastorino
8b86259bea Use the right format when a partial is missing. 
Closes #5025
 2012-02-20 17:53:02 -02:00
José Valim
8c870f11f2 Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset 
Reset memoized hash keys when new ActionView::Template handler is registered
 2012-02-20 11:48:14 -08:00
Chris Kelly
68d3a46194 Reset memoized hash keys when new entry added 2012-02-20 14:35:30 -05:00
Aaron Patterson
3b824d66cd search private / protected methods in trunk ruby 2012-02-20 11:02:56 -08:00
Sokolov Yura
0c0f278ab2 sync __run_callbacks with ruby-trunk 
https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580
In this revision behavior of respond_to? had changed: now to ask about
protected method one should pass second argument `true`
 2012-02-20 10:02:41 -08:00
Andrew White
41c182c368 Remove fixture files with Windows incompatible filenames 
Windows doesn't allow `\ / : * ? " < > |` in filenames so create
the fixture files at runtime and ignore the incompatible ones when
running on Windows.
 2012-02-20 04:57:49 +00:00
Vijay Dev
b2e9bbdcff fix a typo [ci skip] 2012-02-18 23:00:32 +05:30
Mike Gunderloy
44849b1dda Documenting the :inverse_of option for associations 2012-02-18 22:58:54 +05:30
Sergey Nartimov
ed3a15da90 fix spacer template example 2012-02-18 22:21:27 +05:30
Eric Oestrich
ea54d2c93e Update Time#change docs to reflect the options it uses 
[ci skip]
 2012-02-18 22:21:27 +05:30
Alexey Vakhov
168e6532d5 Fix actionpack readme weblog example 2012-02-18 22:21:27 +05:30
Xavier Noria
3b61efc4af Merge pull request #5081 from arunagw/fix_ar_test 
Fix ar test
 2012-02-18 04:52:31 -08:00
Arun Agrawal
742b6159d5 fix test with ruby 187-p358 2012-02-18 15:47:24 +05:30
Andrew White
1b4e6ca9d8 Simplify regexp 2012-02-17 14:45:48 +00:00
Andrew White
86d3bc37b8 Fix ActionDispatch::Static to serve files with unencoded PCHAR 
RFC 3986[1] allows sub-delim characters in path segments unencoded,
however Rack::File requires them to be encoded so we use URI's
unescape method to leave them alone and then escape them again.

Also since the path gets passed to Dir[] we need to escape any glob
characters in the path.

[1]: http://www.ietf.org/rfc/rfc3986.txt
 2012-02-17 14:08:13 +00:00
Santiago Pastorino
1a0bc2ab7f Merge pull request #5071 from arunagw/fix_failing_test_ruby187_p358 
Fix failing test ruby187 p358
 2012-02-17 03:54:34 -08:00
José Valim
45503ecbb9 Merge pull request #5073 from asanghi/4918_backport 
Backporting #4918 with one added test for googlebot accept header as I saw it
 2012-02-17 01:52:55 -08:00
Aditya Sanghi
dffd85a192 backporting #4918 to 3.2 stable; adding extra test for accept header given by googlebot 2012-02-17 15:10:52 +05:30
Arun Agrawal
c17608fe8f Fixes failing test with ruby 1.8.7-p358 
Same as 91a9b24417
 2012-02-17 14:43:34 +05:30
José Valim
a1b9acb72e Merge pull request #5049 from fabioyamate/master 
Fix sanitize_for_mass_assigment when role is nil
 2012-02-15 14:24:35 +01:00
Aaron Patterson
201e67ed36 adding tests to document behavior for #4817 2012-02-14 16:51:49 -08:00
Santiago Pastorino
7c79996c67 Rack body respond to each and not to join 
This fixes undef `to_str' for Rack::Chunked::Body when using
caches_action + streaming on an action

Closes #5027
 2012-02-14 21:53:38 -02:00
José Valim
5f9a5a51de Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo 
Always reenable _dump task in AR databases rake. Closes #5030
 2012-02-14 12:10:56 +01:00
José Valim
305d5d5e90 Fix deprecation warning in AS::Concern. 2012-02-13 15:29:26 +01:00
Jeremy Kemper
92acd5d0e7 Fix that failed tests should exit with a nonzero error code. 
Partially reverts 14c89e7285d4e7cd40a542fbc31d9345f60c3aa4.

Hat tip to @tenderlove for paring down the TestTask!
 2012-02-10 10:34:35 -08:00
Aaron Patterson
73fcbaaa78 Merge pull request #4988 from kennyj/fix_4720-3 
Fix GH #4720. Routing problem with nested namespace and already camelized controller option.
 2012-02-10 10:01:06 -08:00
José Valim
6d17b36778 Merge pull request #4941 from rafaelfranca/fix-build 
Use real table and columns for index test
 2012-02-08 06:42:32 -08:00
Rafael Mendonça França
7c167dd2de Use real table and columns for index test 2012-02-08 11:53:32 -02:00
José Valim
d3d807a173 Push proper test changes for previous commit conflicts. 2012-02-08 14:06:44 +01:00
Paul Sadauskas
0a75336c89 Handle nil in add_index :length option in MySQL 
Our schema.rb is being generated with an `add_index` line similar to this:

    add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil}

This is the same as it was on Rails 3.1.3, however, now when that
schema.rb is evaluated, its generating bad SQL in MySQL:

    Mysql::Error: You have an error in your SQL syntax; check the manual
    that corresponds to your MySQL server version for the right syntax
    to use near '))' at line 1: CREATE UNIQUE INDEX
    `xxx` ON `foo` (`foo`(8), `bar`())

This commit adds a check for nil on the length attribute to prevent the
empty parens from being output.

Conflicts:

	activerecord/test/cases/migration/index_test.rb

Signed-off-by: José Valim <jose.valim@gmail.com>
 2012-02-08 13:34:04 +01:00
Jon Leighton
77b4edce15 Fix attribute_before_type_cast for serialized attributes. Fixes #4837. 
Conflicts:

	activerecord/lib/active_record/core.rb
 2012-02-07 23:41:21 +00:00
Aaron Patterson
b3328779d0 always flush all logs. fixes #4277 2012-02-07 13:50:50 -08:00
Xavier Noria
dafc3c7a06 no need to check for this constant 2012-02-07 21:20:54 +01:00
José Valim
f3595b5924 Merge pull request #4916 from rmm5t/fix_force_ssl_redirect_with_params 
Fixed force_ssl redirects to include original query params
 2012-02-07 09:05:07 -08:00
Ryan McGeary
0e482b3681 Added unit test to cover changes to RouteSet.url_for 
ActionDispatch::Routing::RouteSet.url_for now handles passing params through to
ActionDispatch::Http::Url.url_for
 2012-02-07 11:56:26 -05:00
Markus Fenske
8c7378aae8 Fixed the documenation for 'to_xml' 2012-02-07 17:32:15 +01:00
José Valim
bc85fcb052 Merge pull request #4920 from guilleiguaran/revert-gemfile-edge 
In Rails 3.2.x --edge generate apps with rails 3-2-stable
 2012-02-07 05:31:20 -08:00
Guillermo Iguaran
5bfee55947 --edge option should generate app with rails 3-2-stable 2012-02-07 08:27:32 -05:00
Ryan McGeary
391e6a47db Fixed force_ssl redirects to include original query params 
`ActionController.force_ssl` redirects http URLs to their https equivalent;
however, when a URL contains a query string, the resulting redirect lacked the
original query string.
 2012-02-06 17:47:17 -05:00
Aaron Patterson
dd54137e82 Merge pull request #4912 from guilleiguaran/fix-edge-gemfile 
Add branch to sass-rails and coffee-rails for apps generated with --dev or --edge (3-2-stable)
 2012-02-06 10:39:13 -08:00
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