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
25,253 Commits 34 Branches 105 Tags
c19c55582bf46541d0ae095ea70b65cf18aff775
Commit Graph

25253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
José Valim
c19c55582b Merge pull request #3106 from mattetti/master 
ActiveModel JSON serialization bug fix
 2011-09-22 14:24:39 -07:00
Matt Aimonetti
6e78bbea90 fixed a bug with the json serialization when the class setting is set to not include the root, but an instance is serialized with the root option passed as true 2011-09-22 14:05:25 -07:00
Terence Lee
9d46823b5d set env to let rails know we're precompiling 2011-09-22 20:54:02 +02:00
Terence Lee
1de89e5e07 AR wants sqlite3 1.3.4 2011-09-22 20:01:57 +02:00
Santiago Pastorino
667ef57de6 No need to create a range object 2011-09-22 14:14:24 -03:00
Santiago Pastorino
855184c468 Merge pull request #3096 from phuibonhoa/master 
FileStore key_file_path does not properly limit filenames to 255 characters
 2011-09-22 10:03:54 -07:00
José Valim
43d27e9105 Deprecate passing the template handler in the template name. 
For example, calling hello.erb is now deprecated. Since Rails 3.0
passing the handler had no effect whatsover. This commit simply
deprecates such cases so we can clean up the code in later releases.
 2011-09-22 15:37:38 +02:00
José Valim
c3fa2e9bf8 Make handlers a registered detail. 2011-09-22 15:06:04 +02:00
José Valim
119e9e2daf Get rid of update_details in favor of passing details to find_template. 2011-09-22 15:03:05 +02:00
Nick Sutterer
cbaad674f1 it is now possible to pass details options (:formats, :details, :locales, ...) to #render, #find_template and friends. this doesn't change anything in global context. 2011-09-22 14:12:36 +02:00
Nick Sutterer
41bca5d466 Add rake test:template. 2011-09-22 14:00:53 +02:00
José Valim
1ca3fbfbf2 No need to recalculate the @details_key after update_details. 2011-09-22 12:26:37 +02:00
José Valim
8de0bbe0b4 Merge pull request #3099 from wrozka/master 
Named routes are modifying passed options
 2011-09-22 02:56:00 -07:00
Pawel Pierzchala
019eea4a38 Fix named routes modifying arguments 2011-09-22 09:57:00 +02:00
Philippe Huibonhoa
a0352a425f Updated existing test that fails with this fix (8d63678d14). Before the fix the test was giving a false positive, because file_store.key_file_path would return an empty filename (i.e. test/tmp_cache/4D0/F4D rather than test/tmp_cache/4D0/F4D/xxxx…). 
Even though the fix referenced above divides the filename into directories to prevent it from being too long, it seems that 1000 characters will always raise an error, so reducing the key size to 900).
 2011-09-21 21:03:59 -07:00
Philippe Huibonhoa
8d63678d14 Fixed issue in file store where it could create a filename that was too long for the file system. (https://github.com/rails/rails/issues/3072) 2011-09-21 21:00:46 -07:00
Santiago Pastorino
2bf33bd4bc Merge pull request #3027 from alex3/assets-precompile-regex-fix 
Default precompile regex was erroneously matching files
 2011-09-21 18:25:40 -07:00
Santiago Pastorino
676ddfcf71 Merge pull request #3081 from guilleiguaran/move-precompile-to-class 
Move precompiling from task to Sprockets::StaticCompiler
 2011-09-21 17:21:44 -07:00
Santiago Pastorino
007f567011 Add jquery-rails to Gemfile of plugins, test/dummy app uses it. 
Closes #3091
 2011-09-21 20:53:08 -03:00
José Valim
f373f296d0 Slightly reorganize lookup context modules in order to better isolate cache responsibilities. 2011-09-21 15:37:10 -07:00
Vijay Dev
8aa537c945 fix incorrect comment 2011-09-22 02:13:04 +05:30
Vijay Dev
caa95ab6d8 Merge branch 'master' of github.com:lifo/docrails 2011-09-21 19:35:09 +05:30
Vijay Dev
3e80462b95 Revert "add a missing "on" and remove the "endprologue" text" 
This reverts commit 3c5340ec9c.

Reason: endprologue should not have been removed.
 2011-09-21 19:28:36 +05:30
Vijay Dev
8d7aee7173 indentation fixes 2011-09-21 19:21:58 +05:30
Waynn Lue
3c5340ec9c add a missing "on" and remove the "endprologue" text 2011-09-21 02:10:07 -07:00
Waynn Lue
564d7edf69 add a '.' to etc 2011-09-21 01:28:59 -07:00
Waynn Lue
952bccd1ab add "the" to mirror the structure of the other two points 2011-09-21 01:23:58 -07:00
Santiago Pastorino
95646f44fd Merge pull request #3065 from brainopia/fix_to_param_test 
Fix test to reflect use of to_param for keys
 2011-09-20 20:57:41 -07:00
Guillermo Iguaran
857d20efda Move precompile task to Sprockets::StaticCompiler 2011-09-20 22:01:09 -05:00
Vijay Dev
5684ecf749 copy edits 302e5707 2011-09-20 19:47:33 +05:30
Vijay Dev
ed1ada84ac copy edits 908f2616 2011-09-20 19:46:59 +05:30
Vijay Dev
7ed97bc814 remove unnecessary markup 2011-09-20 19:33:01 +05:30
Santiago Pastorino
7dbf6960c0 Merge pull request #3064 from arunagw/jruby_test_fix_query_cache_test 
fix test error when running with postgresql.
 2011-09-19 12:35:18 -07:00
brainopia
8e3d26733b Fix test to reflect use of to_param for keys 2011-09-18 23:37:27 +04:00
Arun Agrawal
d589d9f160 fix test error when running with postgresql. 
This Sqlite3 should be in if block.
Was giving error because sqlite3 is not loaded
 2011-09-18 23:20:09 +05:30
José Valim
51bef9d8fb to_xml should also rely on serializable hash. 2011-09-18 09:09:01 -07:00
Jan Vlnas
ea29968bcf Locale code for Czech is ":cs" 2011-09-18 16:41:21 +03:00
Santiago Pastorino
cb0dbe35b8 Merge pull request #3049 from brainopia/fix_to_query_edge_case 
Fix Hash#to_query edge case with html_safe string on 1.8 ruby
 2011-09-17 17:15:33 -07:00
Santiago Pastorino
364879c61e Merge pull request #3057 from arunagw/arjdbc_bump_master 
Bump AR-JDBC version.
 2011-09-17 17:12:48 -07:00
Santiago Pastorino
03346dfae7 Merge pull request #3058 from arunagw/jruby_query_cache_test 
Fixed test for JRuby.
 2011-09-17 17:07:31 -07:00
Ryan Bigg
908f2616d5 Document ActiveRecord::QueryMethods#select 2011-09-17 16:08:58 -07:00
Arun Agrawal
afa78fe327 Fixed test for JRuby. 
for Sqlite3 in AR-JDBC.It's Jdbc::SQLite3::VERSION
 2011-09-18 00:23:48 +05:30
Arun Agrawal
b2bf725d79 Bump AR-JDBC version. 
THis version is compatible with 3.1 and above
 2011-09-17 18:39:30 +05:30
Uģis Ozols
663031801c sass-rails helpers - hyphenated in Sass, underscored in Ruby. 2011-09-17 10:00:53 +03:00
Alex Yakoubian
6e63e029b3 Default precompile regexp that properly matches application.js and application.css 2011-09-16 20:46:37 -07:00
Santiago Pastorino
18116791d0 Proper lines numbers for stack trace info 2011-09-16 17:28:52 -07:00
brainopia
3a04e370e4 Fix Hash#to_query edge case with html_safe string on 1.8 ruby 2011-09-16 22:59:16 +04:00
Vijay Dev
27f1320fde Fixing incorrect notextile tags 2011-09-16 23:22:50 +05:30
Vijay Dev
8411f631c4 minor edit 2011-09-16 23:22:50 +05:30
Vijay Dev
e314b3ff6d Merge pull request #3048 from masterkain/patch-2 
Fix typo in deprecation notice
 2011-09-16 10:41:18 -07:00