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,493 Commits 34 Branches 105 Tags
1774ec7464877cfb2e0900344deff17c78bc491f
Commit Graph

25493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santiago Pastorino
1774ec7464 Merge pull request #3266 from arunagw/warnings_removed 
Warnings removed when running with 1.9.3
 2011-10-09 07:34:56 -07:00
Arun Agrawal
ca219a21b6 Warnings removed when running with 1.9.3 2011-10-09 17:15:55 +05:30
José Valim
2ed66feae0 Merge pull request #3262 from subdigital/master 
Add optional host option to force_ssl
 2011-10-09 02:52:42 -07:00
José Valim
501e5b0d7f Merge pull request #3196 from avakhov/patch-am-av-tests-2 
Improve tests method for ActionView::TestCase and ActionMailer::TestCase
 2011-10-09 02:15:19 -07:00
Jeremy Kemper
bedd6dcd43 Merge pull request #500 from cyril/patch-1 
Use quotes for command substitution
 2011-10-08 20:29:56 -07:00
Liborio Cannici
114218e4da Fixes an issue when creating a date select with too many options. 
Inspired by dlt 9e61563474

Closes #239.

Conflicts:

	actionpack/CHANGELOG
 2011-10-08 18:02:15 -07:00
Ben Scheirman
d68f27e9b1 accept optional :host parameter to force_ssl 2011-10-08 18:38:02 -05:00
Guillermo Iguaran
f655895e87 Isolate rake action tests that should be run under default env 2011-10-08 16:44:40 -05:00
Jeremy Kemper
2274c9212e Merge remote-tracking branch 'guilleiguaran/test-utf8-assets-filename' 
Closes #3261
 2011-10-08 13:29:19 -07:00
Guillermo Iguaran
b111b41d13 Test utf8 assets filenames with request instead of manifest lookup 2011-10-08 15:24:52 -05:00
Jeremy Kemper
4888aba15f The generator invokes rake with either the :env option, ENV['RAILS_ENV'], or development. So if Travis has exported RAILS_ENV=test, it'll be used instead of development, breaking these brittle expectations. 2011-10-08 13:09:28 -07:00
Jeremy Kemper
9ce03d1542 Skip broken asset precompilation test on Macs. Issues with NFD vs NFC normalization on the asset filename. Major red flag with asset lookups! 2011-10-08 12:56:06 -07:00
Jeremy Kemper
0d0ded39ef Don't notify IRC on every single build, just failures and first success after a string of failures 2011-10-08 11:13:48 -07:00
Jeremy Kemper
8a6acc17bb Disable 1.9.3 builds until upgraded from -preview1 to -rc1 2011-10-08 11:13:12 -07:00
Jeremy Kemper
1851791803 Add comments to our generated .gitignore, including a note about when to use a global gitignore. Remove .sass-cache since we use /tmp/sass-cache, which is already ignored. 2011-10-08 08:04:05 -07:00
Santiago Pastorino
96e1dc3440 Revert "Merge pull request #3254 from arunagw/app_gitignore_sqlnet_log" 
This reverts commit bb8e067329, reversing
changes made to 11687382db.
 2011-10-08 12:54:24 -02:00
Santiago Pastorino
bb8e067329 Merge pull request #3254 from arunagw/app_gitignore_sqlnet_log 
Sqlnet should also be ignored into the app gitignore
 2011-10-08 05:47:33 -07:00
Arun Agrawal
6c9090d192 Sqlnet should also be ignored into the app gitignore 2011-10-08 14:39:19 +05:30
José Valim
11687382db Merge pull request #3249 from arunagw/query_cache_test_fix 
Fixed BodyProxy.new for tests! for wrong argument
 2011-10-08 01:17:57 -07:00
José Valim
135a97af76 Merge pull request #3250 from arunagw/adding_sqlnet_to_gitignore 
sqlnet.log file to gitignore. Generates when running with oracle!
 2011-10-08 01:17:28 -07:00
José Valim
cf92e41513 Merge pull request #3252 from avakhov/p-remove-expire_page-dup 
Remove unnecessary dup in expire_page
 2011-10-08 01:15:21 -07:00
Alexey Vakhov
a4515b60e3 Remove unnecessary dup in expire_page 2011-10-08 11:01:31 +04:00
Arun Agrawal
1e8feb8440 sqlnet.log file to gitignore. Generates when running with oracle! 2011-10-08 10:06:19 +05:30
Arun Agrawal
34d950b066 Fixed BodyProxy.new for tests! for wrong argument 2011-10-08 10:01:58 +05:30
Aaron Patterson
7f64e47277 just check to see that the first item in the list is an array 2011-10-07 16:56:18 -07:00
Vijay Dev
d2db917841 fix bad formatting in the assets guide 2011-10-08 02:22:49 +05:30
José Valim
8a4239fc7e testing.rake should set the default task, closes #2564 2011-10-07 22:25:10 +02:00
Vijay Dev
0d3d9a150a closes #3241 - partial doc fix 2011-10-07 23:53:12 +05:30
Vijay Dev
bec61bd1ea Merge pull request #3244 from ugisozols/master 
One of the activemodel naming tests wasn't asserting anything.
 2011-10-07 10:26:45 -07:00
Vijay Dev
4930f9d2a7 Merge branch 'master' of github.com:lifo/docrails 2011-10-07 22:20:29 +05:30
Vijay Dev
cb244f4f70 use https for github url 2011-10-07 22:19:55 +05:30
mhutchin
fca2613ec4 Correct formatting 2011-10-07 08:26:05 -07:00
mhutchin
d4ea804e21 Replace the reference to the annotate_models plugin (unchanged since 2008) with more current annotate_models gem 2011-10-07 08:16:33 -07:00
Uģis Ozols
4015080efd One of the activemodel naming tests wasn't asserting anything. 2011-10-07 16:42:44 +03:00
Xavier Noria
9312d217d6 Merge branch 'master' of github.com:rails/rails 2011-10-07 15:07:14 +02:00
Xavier Noria
b1c20e37ec asset pipeline guide: removes Apache config for serving pre-compressed assets, and expands the information about nginx support for this 
A robust Apache configuration for this feature seems to be tricky,
one that takes into account Accept-Encoding, sets Vary, ensures
Content-Type is right, etc.
 2011-10-07 15:05:14 +02:00
Santiago Pastorino
ea341b8e04 Merge pull request #3243 from mjtko/connection-pool-thread-fix 
QueryCache/ConnectionPool thread fix (was #1670)
 2011-10-07 05:25:31 -07:00
Mark J. Titorenko
f41b58d3b2 use thread locals and an instance variable within QueryCache#BodyProxy to maintain appropriate linkage with AR database connection across threads 2011-10-07 10:05:51 +01:00
Aaron Patterson
3088d23647 Merge pull request #3232 from Juanmcuello/pg_prepared_statements 
Use the schema_search_path in prepared statements.
 2011-10-06 20:08:05 -07:00
Dimitar Dimitrov
ddee206dfb More understandable warning in the local_constant_names section 
Rewrite the warning about local_constant_names in Ruby 1.8 to make it more understandable. Word ordering fixes in the same section.
 2011-10-07 03:14:59 +03:00
clay shentrup
0549ba10b3 Clarifying ambiguous description of require_self in the asset pipeline 2011-10-06 16:09:36 -07:00
Aaron Patterson
99888487b6 fix require 2011-10-06 15:31:56 -07:00
Manuel Menezes de Sequeira
a17e5e2462 Merge branch 'master' of github.com:lifo/docrails 2011-10-06 21:31:26 +01:00
Manuel Menezes de Sequeira
29bf193cad Undid previous change which violated the convention regarding output (use "# =>") used in these guides. Corrected typo in previous correction. (Thanks for pointing this out, vijaydev.) 2011-10-06 21:29:58 +01:00
Vijay Dev
545ddbdbc5 fix an example 2011-10-06 23:50:16 +05:30
Vijay Dev
2224a06b72 fix a space in the assets guide 2011-10-06 20:04:09 +05:30
Xavier Noria
9d091c038d revises the precompilation section of the asset pipeline guide (web server configuration for gzipped assets pending) 2011-10-06 16:23:56 +02:00
José Valim
89623e9946 Merge pull request #3236 from yahonda/fix_test_nonexisting_method_with_arguments 
Fixed test_nonexisting_method_with_arguments to revert commit 29a5aea
 2011-10-06 04:52:25 -07:00
Yasuo Honda
281b8caf80 Fixed test_nonexisting_method_with_arguments to revert commit 29a5aea 2011-10-06 07:44:48 -04:00
Vijay Dev
33799c8fc3 Merge pull request #3203 from jrmehle/fix_clone_structure 
db:test:clone_structure if path to .sql file contains spaces or dashes
 2011-10-06 02:13:36 -07:00