aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1591 from smartinez87/unusedJosé Valim2011-06-082-3/+3
|\
| * Remove unused 'y' variable.Sebastian Martinez2011-06-081-2/+2
| * Remove unused 'quoted_column_names' variable.Sebastian Martinez2011-06-081-1/+1
* | Merge pull request #1588 from neerajdotname/remove_unused_class_with_symbol_r...José Valim2011-06-081-12/+0
|\ \
| * | class WithSymbolReturningString is not used anywhere in the test.Neeraj Singh2011-06-081-12/+0
| |/
* | Merge pull request #1579 from bradleybuda/masterJosé Valim2011-06-082-4/+12
|\ \
| * | Allow a Date to be frozen more than once without an error in Ruby 1.8.xBradley Buda2011-06-082-4/+12
* | | Merge pull request #1577 from reu/useless-variable-setJosé Valim2011-06-081-1/+0
|\ \ \
| * | | No need to create a new Arel::Table, as the arel_table method already creates...Rodrigo Navarro2011-06-081-1/+0
| |/ /
* | | Merge pull request #1593 from r00k/masterAaron Patterson2011-06-081-1/+1
|\ \ \ | |_|/ |/| |
| * | Simplify boolean logic into ternary.Ben Orenstein2011-06-081-1/+1
|/ /
* | Indention style + whitespace for readabilityDavid Heinemeier Hansson2011-06-091-33/+38
* | If you set a js_compressor, it means that you want shit compressed -- we dont...David Heinemeier Hansson2011-06-091-2/+2
|/
* Merge pull request #1564 from sikachu/master-changelogAaron Patterson2011-06-081-0/+29
|\
| * Update CHANGELOG to mention the new SafeBuffer changePrem Sichanugrist2011-06-081-0/+29
|/
* Merge pull request #1560 from sikachu/master-escapejsJosé Valim2011-06-082-1/+8
|\
| * Make escape_javascript happy to handle SafeBuffersPaul Gallagher2011-06-082-1/+8
* | Merge pull request #1559 from neerajdotname/before_filter_testJosé Valim2011-06-081-1/+1
|\ \ | |/ |/|
| * Make test meaningfulNeeraj Singh2011-06-081-1/+1
|/
* Merge pull request #1556 from thoefer/masterJosé Valim2011-06-083-5/+17
|\
| * Brought back alternative convention for namespaced models in i18n.thoefer2011-06-083-5/+17
|/
* Merge pull request #1550 from rsim/fix_test_has_many_with_pluralize_table_nam...Xavier Noria2011-06-081-2/+2
|\
| * Do not hardcode :id as it was ignored by mass assignment filterRaimonds Simanovskis2011-06-081-2/+2
|/
* Merge pull request #1549 from neerajdotname/rename_to_method_for_actionJosé Valim2011-06-081-2/+2
|\
| * test name should reflect the name of the methodNeeraj Singh2011-06-081-2/+2
* | Merge pull request #1548 from neerajdotname/remove_class_me5José Valim2011-06-081-6/+0
|\ \
| * | remove unused class from testNeeraj Singh2011-06-081-6/+0
| |/
* | Merge pull request #1547 from sikachu/safebufferJosé Valim2011-06-073-5/+10
|\ \ | |/ |/|
| * Fix failing test on uninitialized `Rails.config.assets.prefix`Prem Sichanugrist2011-06-081-0/+1
| * Add proper fix to `mail_to` helper.Prem Sichanugrist2011-06-081-2/+2
| * Adapt [823aa223efbac6ad4d31ea33402892267bb77cb4] to make sure we perform clon...Prem Sichanugrist2011-06-081-3/+7
* | Merge pull request #1542 from cmeiklejohn/dont_gsub_on_safebufferJosé Valim2011-06-071-1/+2
|\ \
| * | Don't operate on the safebuffer, operate on a string and convert.Christopher Meiklejohn2011-06-071-1/+2
* | | Merge pull request #1535 from smartinez87/eachJosé Valim2011-06-071-1/+1
|\ \ \ | |_|/ |/| |
| * | Prefer 'each' over 'for in' syntax.Sebastian Martinez2011-06-071-1/+1
| |/
* | remove warning: assigned but unused variableSantiago Pastorino2011-06-0820-26/+16
* | ruby-prof doesn't work in 1.9.3Santiago Pastorino2011-06-081-1/+2
* | Merge pull request #1539 from cmeiklejohn/fix_safe_buffer_in_fragment_cachingAaron Patterson2011-06-071-1/+3
|\ \ | |/ |/|
| * Fragment caching needs to operate on the pure output, not theChristopher Meiklejohn2011-06-071-1/+3
|/
* Ensure that the strings returned by SafeBuffer#gsub and friends aren't consid...Michael Koziarski2011-06-072-0/+25
* Allow polymorphic has_one to work when the association is set before the owne...Jon Leighton2011-06-082-3/+12
* When you add a record to a polymorphic has_one, you should be able to access ...Jon Leighton2011-06-083-3/+6
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-083-64/+80
|\
| * fix spacingVijay Dev2011-06-081-1/+1
| * Add action_mailer observer and interceptors configuration optionsPaco Guzman2011-06-072-5/+15
| * add missing generator configsVijay Dev2011-06-081-3/+7
| * proof reading and fixes in configuring guideVijay Dev2011-06-081-55/+57
| * fix indents and a code error in caching guideVijay Dev2011-06-081-4/+4
* | Merge pull request #1533 from alexandrz/masterXavier Noria2011-06-071-1/+1
|\ \
| * | fix typoAlexandr Zykov2011-06-081-1/+1
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 22:27:35 +0000