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
24,387 Commits 34 Branches 105 Tags
eabc036496c4f4dbafdcedef7ec8e857fd08641d
Commit Graph

24387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Peek
eabc036496 Merge pull request #2448 from igrigorik/master 
Asset pipeline fixes: clear out tmp cache and use environment in digest generation
 2011-08-08 07:42:49 -07:00
Aaron Patterson
9e5140078f Merge pull request #2451 from gdelfino/master 
sqlite transactions in log files
 2011-08-07 18:22:32 -07:00
Xavier Noria
e746980507 guides generation: apparently this workaround for RedCloth is not needed anymore 2011-08-07 16:20:51 -07:00
Xavier Noria
e06db7276c Merge pull request #2457 from Gregg/zombie_singular_fix 
Added irregular zombie inflection, so zombies != zomby
 2011-08-07 11:34:10 -07:00
Gregg Pollack
554232e481 Added irregular zombie inflection, so zombies no longer gets singularized into zomby 2011-08-07 14:20:03 -04:00
Santiago Pastorino
9c205624ee Merge pull request #2455 from vijaydev/patch-7 
Edit changelog to mention about x_sendfile_header default change
 2011-08-07 11:01:29 -07:00
Vijay Dev
4cf94979c9 edit changelog to mention about x_sendfile_header default change -
Santiago Pastorino
8845ae683e x_sendfile_header now defaults to nil and production.rb env file doesn't 
set a particular value for it. This allows servers to set it through
X-Sendfile-Type, read
https://github.com/rack/rack/blob/master/lib/rack/sendfile.rb for more
info. Anyways you can force this value in your production.rb
 2011-08-07 13:11:50 -03:00
José Valim
888539c541 Test against 1.9.3 as well. 2011-08-07 13:18:10 +03:00
Gustavo Delfino
cdb49fc2f3 sqlite transactions now logged 
motivation: http://stackoverflow.com/questions/6892630/sqlite-transactions-not-showing-in-test-log
 2011-08-06 16:05:45 -04:30
Santiago Pastorino
7ba95bf747 Merge pull request #2450 from guilleiguaran/activesupport-gzip-1.8 
Fix ActiveSupport::Gzip under Ruby 1.8.7. Closes #2416
 2011-08-06 13:18:51 -07:00
Guillermo Iguaran
aed9917094 Fix ActiveSupport::Gzip under Ruby 1.8.7. Closes #2416 2011-08-06 11:33:18 -05:00
Santiago Pastorino
81eb5b38db Merge pull request #2444 from elight/master 
Minor refactor to delegate
 2011-08-06 05:27:40 -07:00
Santiago Pastorino
43e581ef7f Use rake >= 0.9.3.beta.1 in Ruby 1.9.3 2011-08-06 09:16:17 -03:00
Ilya Grigorik
c0bfb5a63c use assets.version in asset checksum to allow user to easily override 2011-08-05 22:55:56 -07:00
Evan Light
b642922496 Refactored to more closely resemble idiom applied for on_nil 2011-08-05 22:06:47 -04:00
Santiago Pastorino
201e41e11a Avoid generating app/views/layouts/application.html.erb on mountable engines, just generate the namespaced one 2011-08-05 21:29:00 -03:00
Aaron Patterson
5bc6285cfe Revert "Test against Rubinius" 
This reverts commit 3cfbb38244.
 2011-08-05 15:51:33 -07:00
Aaron Patterson
cec805f515 Merge pull request #2442 from sferik/test_on_rubinius 
Test against Rubinius
 2011-08-05 15:47:23 -07:00
Erik Michaels-Ober
3cfbb38244 Test against Rubinius 
Happy Rubinius Day!
 2011-08-05 15:44:28 -07:00
Santiago Pastorino
1b676fc760 Revert "to_key on a destroyed model should return nil". Closes #2440 
This reverts commit c5448721b5.
 2011-08-05 19:39:19 -03:00
Santiago Pastorino
e0a6ec2149 Fix test for Rubinius 2011-08-05 16:48:46 -03:00
Aaron Patterson
ab2582f417 Merge pull request #2439 from guilleiguaran/fix-error-on-ar-tests-rbxday 
Fix AR test suite error under Rubinius 2.0 #rbxday
 2011-08-05 11:28:53 -07:00
Guillermo Iguaran
780ee36c56 Fix AR test suite error under Rubinius 2.0 2011-08-05 13:20:18 -05:00
Aaron Patterson
5a05207d99 pg does not allow aliases in the having clause, but functions are fine 2011-08-05 11:20:15 -07:00
Ilya Grigorik
fe55f5e581 Merge branch 'asset_hash_should_depend_on_env' 2011-08-04 23:55:31 -04:00
Ilya Grigorik
050c1510b6 Clear out tmp/cache when assets:clean is invoked. 
Otherwise, if bad data is cached in tmp/clear then the next invocation
of assets:precompile (or a regular incoming request) will pickup files from
tmp without regenerating them from source.
 2011-08-04 23:54:22 -04:00
Ilya Grigorik
ed5c6d254c generate environment dependent asset digests 
If two different environments are configured to use the pipeline, but
one has an extra step (such as compression) then without taking the
environment into account you may end up serving wrong assets
 2011-08-04 23:53:32 -04:00
Ilya Grigorik
e44efac086 Clear out tmp/cache when assets:clean is invoked. 
Otherwise, if bad data is cached in tmp/clear then the next invocation
of assets:precompile (or a regular incoming request) will pickup files from
tmp without regenerating them from source.
 2011-08-04 23:53:32 -04:00
Xavier Noria
04f88d1630 Merge branch 'master' of github.com:rails/rails 2011-08-04 16:42:14 -07:00
Xavier Noria
9e18380a32 Revert "Explicitly included hashes in sentence regarding SQL-injection-safe forms" 
Reason: The hash form is secure, and preferred over the array form if possible.

This reverts commit 6dc749596c.
 2011-08-04 16:41:31 -07:00
Xavier Noria
e82b4901eb Revert "grammatical changes" 
Reason: As discussed in GitHub, it is debatable, and present tense
is fine (and simple, and preferred).

This reverts commit 54ccda9f0a5e4a5e72a4c159dc8787faaf65e8a2.
 2011-08-04 16:41:31 -07:00
Rashmi Yadav
681d919e48 The trailing '/' isn't being picked up by Github anyway, and the link works as is. 2011-08-04 16:41:31 -07:00
Waynn Lue
5f2c790cb7 The trailing '/' isn't being picked up by Github anyway, and the link works as is. 2011-08-04 16:41:31 -07:00
JudeArasu
2e764c5fd1 grammatical changes 2011-08-04 16:41:30 -07:00
Vijay Dev
25845b3d42 typo fix 2011-08-04 16:41:30 -07:00
Vijay Dev
febdd6c96c minor changes in migrations guide 2011-08-04 16:41:30 -07:00
Vijay Dev
b3719ee7ed fixed incorrect tags 2011-08-04 16:41:30 -07:00
pbflinn
9e1a27a0ac Fix typo 'console' -> 'constant' 2011-08-04 16:41:30 -07:00
Vishnu Atrai
f3564b9e22 Active Resource - guide for destroy 2011-08-04 16:41:29 -07:00
Vishnu Atrai
eed1026e83 Active Resource - guide for update/save 2011-08-04 16:41:29 -07:00
Vishnu Atrai
163533b17d Active Resource - guide for create 2011-08-04 16:41:29 -07:00
Vishnu Atrai
abfbab2713 Active Resource - guide for reading and writing data 2011-08-04 16:41:29 -07:00
Waynn Lue
dbc10a09b3 typo in "wont" 2011-08-04 16:41:29 -07:00
Vijay Dev
05f6135895 3.1 release notes Active Record changes, Architectural changes and 
organizing sections.
 2011-08-04 16:41:28 -07:00
Arun Agrawal
f63599825b Adding more info as rake about is fixed 2011-08-04 16:41:28 -07:00
Arun Agrawal
8362b070dc Rack::Sendfile is no more default middleware. 2011-08-04 16:41:28 -07:00
Waynn Lue
384ac3eca7 "blog" is more common than "weblog" these days. 2011-08-04 16:41:28 -07:00
Vijay Dev
fe6b967aea 3.1 release notes - added AP and Railties sections 2011-08-04 16:41:28 -07:00
Vijay Dev
4e28c40bfd 3.1 release notes draft 2011-08-04 16:41:27 -07:00