aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-2113-28/+100
|\
| * Revert "add a missing "on" and remove the "endprologue" text"Vijay Dev2011-09-211-1/+3
| | | | | | | | | | | | This reverts commit 3c5340ec9cbf12d19e734289ba748186af492d60. Reason: endprologue should not have been removed.
| * indentation fixesVijay Dev2011-09-211-2/+2
| |
| * add a missing "on" and remove the "endprologue" textWaynn Lue2011-09-211-3/+1
| |
| * add a '.' to etcWaynn Lue2011-09-211-1/+1
| |
| * add "the" to mirror the structure of the other two pointsWaynn Lue2011-09-211-1/+1
| |
| * copy edits 302e5707Vijay Dev2011-09-201-4/+3
| |
| * copy edits 908f2616Vijay Dev2011-09-201-4/+4
| |
| * remove unnecessary markupVijay Dev2011-09-201-6/+6
| |
| * Locale code for Czech is ":cs"Jan Vlnas2011-09-181-1/+1
| |
| * Document ActiveRecord::QueryMethods#selectRyan Bigg2011-09-171-0/+29
| |
| * sass-rails helpers - hyphenated in Sass, underscored in Ruby.Uģis Ozols2011-09-171-5/+5
| |
| * Fixing incorrect notextile tagsVijay Dev2011-09-169-24/+26
| |
| * minor editVijay Dev2011-09-161-1/+1
| |
| * Merge pull request #68 from kirs/masterKir Shatrov2011-09-161-0/+14
| |\ | | | | | | Paragraph about using variables in I18n translations was added to I18n Guide
| | * "Passing variables into the translation" section addedKir Shatrov2011-09-161-0/+14
| |/
| * Add reference about --skip-sprockets to Asset Pipeline GuideGuillermo Iguaran2011-09-151-0/+6
| |
| * update guides, use html safe translations in i18nAlexey Vakhov2011-09-152-0/+22
| |
* | Merge pull request #3065 from brainopia/fix_to_param_testSantiago Pastorino2011-09-201-8/+8
|\ \ | | | | | | Fix test to reflect use of to_param for keys
| * | Fix test to reflect use of to_param for keysbrainopia2011-09-181-8/+8
| | |
* | | Merge pull request #3064 from arunagw/jruby_test_fix_query_cache_testSantiago Pastorino2011-09-191-2/+4
|\ \ \ | |/ / |/| | fix test error when running with postgresql.
| * | fix test error when running with postgresql.Arun Agrawal2011-09-181-2/+4
|/ / | | | | | | | | This Sqlite3 should be in if block. Was giving error because sqlite3 is not loaded
* | to_xml should also rely on serializable hash.José Valim2011-09-183-32/+33
| |
* | Merge pull request #3049 from brainopia/fix_to_query_edge_caseSantiago Pastorino2011-09-172-1/+10
|\ \ | | | | | | Fix Hash#to_query edge case with html_safe string on 1.8 ruby
| * | Fix Hash#to_query edge case with html_safe string on 1.8 rubybrainopia2011-09-162-1/+10
| | |
* | | Merge pull request #3057 from arunagw/arjdbc_bump_masterSantiago Pastorino2011-09-171-3/+3
|\ \ \ | | | | | | | | Bump AR-JDBC version.
| * | | Bump AR-JDBC version.Arun Agrawal2011-09-171-3/+3
| | | | | | | | | | | | THis version is compatible with 3.1 and above
* | | | Merge pull request #3058 from arunagw/jruby_query_cache_testSantiago Pastorino2011-09-171-1/+2
|\ \ \ \ | |/ / / |/| | | Fixed test for JRuby.
| * | | Fixed test for JRuby. Arun Agrawal2011-09-181-1/+2
|/ / / | | | | | | for Sqlite3 in AR-JDBC.It's Jdbc::SQLite3::VERSION
* / / Proper lines numbers for stack trace infoSantiago Pastorino2011-09-161-1/+1
|/ /
* | Merge pull request #3048 from masterkain/patch-2Vijay Dev2011-09-161-1/+1
|\ \ | | | | | | Fix typo in deprecation notice
| * | Fix typo in deprecation noticeClaudio Poli2011-09-161-1/+1
|/ /
* | Merge pull request #3042 from splattael/patch-1Vijay Dev2011-09-161-1/+1
|\ \ | | | | | | Fix typo in deprecation warning.
| * | Fix typo in deprecation warning.Peter Suschlik2011-09-161-1/+1
|/ /
* | Merge pull request #3040 from ↵José Valim2011-09-152-17/+0
|\ \ | | | | | | | | | | | | guilleiguaran/asset-host-should-not-be-nil-precompile config.action_controller.asset_host shouldn't set to nil during precompile
| * | config.action_controller.asset_host shouldn't set to nil during precompileGuillermo Iguaran2011-09-152-17/+0
|/ /
* | Merge pull request #3037 from wvanbergen/masterJosé Valim2011-09-154-22/+40
|\ \ | | | | | | MessageVerifier: set serializer and crypto algorithm using an option hash
| * | Test deprecation warning when not using an options hash as second parameter.Willem van Bergen2011-09-152-2/+14
| | |
| * | Use an options hash to specify digest/cipher algorithm and a serializer for ↵Willem van Bergen2011-09-154-20/+26
| | | | | | | | | | | | MessageVerifier and MessageEncryptor.
* | | Merge pull request #3035 from wvanbergen/masterJosé Valim2011-09-154-18/+39
|\| | | | | | | | Make API for custom message serializers nicer.
| * | Add some documentation for the new serializer property of MessageVerifier ↵Willem van Bergen2011-09-151-0/+5
| | | | | | | | | | | | and MessageEncryptor.
| * | Implement API suggestions of pull request.Willem van Bergen2011-09-154-18/+34
| | |
* | | Merge pull request #3031 from wvanbergen/masterJosé Valim2011-09-154-5/+30
|\| | | | | | | | Custom serializers and deserializers in MessageVerifier and MessageEncryptor.
| * | Fixed tests so that they will also run properly in other timezones.Willem van Bergen2011-09-152-4/+4
| | |
| * | Custom serializers and deserializers in MessageVerifier and MessageEncryptor.Willem van Bergen2011-09-154-5/+30
|/ / | | | | | | | | By default, these classes use Marshal for serializing and deserializing messages. Unfortunately, the Marshal format is closely associated with Ruby internals and even changes between different interpreters. This makes the resulting message very hard to impossible to unserialize messages generated by these classes in other environments like node.js. This patch solves this by allowing you to set your own custom serializer and deserializer lambda functions. By default, it still uses Marshal to be backwards compatible.
* / Allow asset tag helper methods to accept :digest => false option in order to ↵Santiago Pastorino2011-09-148-39/+58
|/ | | | completely avoid the digest generation.
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-1531-233/+74
|\
| * No more changelogs inside guidesVijay Dev2011-09-1527-211/+0
| |
| * Mention that old fixes are to be done on 3-0-stableVijay Dev2011-09-141-3/+3
| |
| * minor editVijay Dev2011-09-141-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-02 20:06:10 +0000