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 |
|
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 |
|
Claudio Poli
|
b0ae34ad72
|
Fix typo in deprecation notice
|
2011-09-16 19:54:48 +03:00 |
|
Kir Shatrov
|
9f0db93250
|
Merge pull request #68 from kirs/master
Paragraph about using variables in I18n translations was added to I18n Guide
|
2011-09-16 06:44:04 -07:00 |
|
Kir Shatrov
|
302e570777
|
"Passing variables into the translation" section added
|
2011-09-16 17:43:05 +04:00 |
|
Vijay Dev
|
d5bf12aca6
|
Merge pull request #3042 from splattael/patch-1
Fix typo in deprecation warning.
|
2011-09-16 06:17:15 -07:00 |
|
Peter Suschlik
|
c9aac2a215
|
Fix typo in deprecation warning.
|
2011-09-16 09:08:53 +03:00 |
|
José Valim
|
79c7f23376
|
Merge pull request #3040 from guilleiguaran/asset-host-should-not-be-nil-precompile
config.action_controller.asset_host shouldn't set to nil during precompile
|
2011-09-15 18:08:42 -07:00 |
|
Guillermo Iguaran
|
28677014a4
|
Add reference about --skip-sprockets to Asset Pipeline Guide
|
2011-09-15 20:07:01 -05:00 |
|
Guillermo Iguaran
|
b50394bf84
|
config.action_controller.asset_host shouldn't set to nil during precompile
|
2011-09-15 19:55:52 -05:00 |
|
José Valim
|
8a32a58f6f
|
Merge pull request #3037 from wvanbergen/master
MessageVerifier: set serializer and crypto algorithm using an option hash
|
2011-09-15 13:22:05 -07:00 |
|
Willem van Bergen
|
6d520803ee
|
Test deprecation warning when not using an options hash as second parameter.
|
2011-09-15 15:51:30 -04:00 |
|
Willem van Bergen
|
41fea03342
|
Use an options hash to specify digest/cipher algorithm and a serializer for MessageVerifier and MessageEncryptor.
|
2011-09-15 14:27:12 -04:00 |
|
José Valim
|
28300f4ea8
|
Merge pull request #3035 from wvanbergen/master
Make API for custom message serializers nicer.
|
2011-09-15 10:50:19 -07:00 |
|
Willem van Bergen
|
2d30d4cb88
|
Add some documentation for the new serializer property of MessageVerifier and MessageEncryptor.
|
2011-09-15 13:23:08 -04:00 |
|