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,420 Commits 34 Branches 105 Tags
cfc95d89aeffba5a026afcf272bdf3ff231a8983
Commit Graph

25420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juan M. Cuello
cfc95d89ae Use the schema_search_path in prepared statements. 
To allow the use of prepared statements when changing schemas in
postgres, the schema search path is added to the sql key.
 2011-10-05 11:43:03 -03:00
José Valim
c495bfc127 Do not require railtie as it messes up Rails.application setup. 2011-10-05 15:31:38 +02:00
Vijay Dev
46ce7f1f77 Merge branch 'master' of github.com:lifo/docrails 2011-10-05 18:42:18 +05:30
Vijay Dev
ea49935a6e copy editing 2011-10-05 18:40:45 +05:30
Manuel Menezes de Sequeira
34ed93931d Merge branch 'master' of github.com:lifo/docrails 2011-10-05 11:59:47 +01:00
Manuel Menezes de Sequeira
4406bbe147 s/help/helper/ 2011-10-05 11:59:03 +01:00
Hendy Tanata
a44bbfc1c7 Corrections to Active Record Validations and Callbacks guide. 2011-10-05 17:35:58 +08:00
José Valim
ae4febdf84 Merge pull request #3229 from amatsuda/string_prepend 
ruby193: String#prepend
 2011-10-05 00:38:57 -07:00
José Valim
4cea4ee6b5 Fix regression when calling helpers inside sprockets. 2011-10-05 09:37:58 +02:00
Robert Ross
463223c324 Merge branch 'master' of github.com:lifo/docrails 2011-10-04 23:42:50 -07:00
Robert Ross
ac49fb1aa9 Change one more place for JSON string to Hash 2011-10-04 23:42:37 -07:00
Akira Matsuda
87eab595d8 ruby193: String#prepend is also unsafe 2011-10-05 15:26:29 +09:00
Akira Matsuda
9c4fe308b6 override unsafe methods only if defined on String 2011-10-05 15:26:28 +09:00
José Valim
87c57bb88f Fix the lame config.action_controller.present? check scattered throughout assets_path. 
Conflicts:

	actionpack/test/template/sprockets_helper_test.rb
 2011-10-05 02:35:43 +02:00
Jon Leighton
ee2be435b1 Raise error on unknown primary key. 
If we don't have a primary key when we ask for it, it's better to fail
fast. Fixes GH #2307.
 2011-10-05 01:11:40 +01:00
José Valim
5711a35ad8 Ensure default_asset_host_protocol is respected, closes #2980. 2011-10-05 02:08:02 +02:00
José Valim
ac2f6bd643 Encapsulate common rake invocation logic in a method. 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-05 01:25:55 +02:00
Mark J. Titorenko
110ce85482 added comment about why nondigest assets requires a reinvocation 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-05 01:25:47 +02:00
Mark J. Titorenko
26a62a6552 only reinvoke if necessary 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-05 01:25:39 +02:00
Mark J. Titorenko
42eda8f8a1 only execute the nondigest task if needed 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-05 01:25:05 +02:00
Mark J. Titorenko
ee51cc30ff don't munge the environment, let rake do that for us 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-05 01:25:01 +02:00
Mark J. Titorenko
b41bd968c6 assets compilation task refactoring 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-05 01:24:58 +02:00
Ryan Bigg
2c4e08d872 [engines guide] initial layout 2011-10-05 08:38:04 +11:00
José Valim
dc85fc546f Fix failing test added in previous commit. 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-04 22:04:56 +02:00
Mark J. Titorenko
9c69ef3167 correct path used in "digested assets are not mistakenly removed" test 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-04 22:04:49 +02:00
Mark J. Titorenko
1f0b78e045 add failing test: "digested assets are removed from configured path" 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-04 22:04:45 +02:00
Robert Ross
eef176dc7d Fix as_json doc to say what it actually returns. 2011-10-04 09:37:54 -07:00
Santiago Pastorino
db262211c9 Bump sprockets to 2.0.2 2011-10-04 14:14:36 -02:00
Manuel Menezes de Sequeira
bb4edc8edf More corrections and clarifications to the Active Record Validations and Callbacks guide. 2011-10-04 16:13:16 +01:00
Santiago Pastorino
997efed103 Merge pull request #3212 from ayrton/master 
incorrect to_formatted_s example
 2011-10-04 05:34:25 -07:00
Ayrton De Craene
02b0f8d9ff to_formatted_s is an instance method for a Range not an Array 2011-10-04 15:21:23 +03:00
José Valim
96aa3bd0ea Clean up subdomain code a bit. 2011-10-04 11:31:47 +02:00
José Valim
b039069756 Merge pull request #3209 from ksob/subdomain_false_strips_subdomains 
:subdomain => false will remove all subdomains now. Closes #2025
 2011-10-04 02:26:40 -07:00
José Valim
7f1a666db5 Fix failing tests and refactor assets.rake 2011-10-04 11:25:36 +02:00
Ben Woosley
88f60fd1a7 Changing rake db:schema:dump to run :environment as well as :load_config, as running :load_config alone will lead to the dumper being run without including extensions such as those included in foreigner and spatial_adapter. 
This reverses a change made here: 5df72a238e (L0L324)

I'm assuming here that :load_config needs to be invoked separately from :environment, as it is elsewhere in the file for db operations, if not the alternative is to go back to "task :dump => :environment do".

Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-04 11:25:20 +02:00
Kamil Sobieraj
de942e5534 :subdomain can now be specified with a value of false in url_for, allowing for subdomain(s) removal from the host during link generation. Closes #2025 2011-10-04 09:16:34 +01:00
José Valim
1eac911962 Merge pull request #3202 from abscondment/3053-missing-headers 
Use rack-cache 1.1
 2011-10-03 12:28:31 -07:00
Brendan Ribera
b05a56f47d Require rack-cache 1.1. 
Versions prior to 1.1 delete the If-Modified-Since and If-Not-Modified headers when
config.action_controller.perform_caching is true. This has two problems:
 * unexpected inconsistent behaviour between development & production environments
 * breaks applications that use of these headers
 2011-10-03 11:32:24 -07:00
Brendan Ribera
57d9737f2f Test demonstrating #3053: If-Modified-Since gets swallowed up by rack-cache. 2011-10-03 11:32:24 -07:00
Jeremy Kemper
c10fcd2637 Merge pull request #2801 from jeremyevans/patch-1 
Fix obviously breakage of Time.=== for Time subclasses
 2011-10-03 10:53:09 -07:00
Manuel Menezes de Sequeira
547f4af2ca Several small corrections and clarifications to the Active Record Validations and Callbacks guide. 2011-10-03 18:03:35 +01:00
Aaron Patterson
e141cbdff5 Merge pull request #3191 from yahonda/activerecord_unittest_db2 
To support ActiveRecord unit tests for IBM DB2
 2011-10-03 09:04:46 -07:00
Yasuo Honda
8cc70cf32a Fix typo in Rakefile 2011-10-03 11:56:11 -04:00
José Valim
2120d7b838 Fix #3198. 2011-10-03 13:38:02 -02:00
Mark J. Titorenko
a7648c213d add failing test for #3198 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-03 13:36:26 -02:00
Santiago Pastorino
177ccbf773 Merge pull request #3200 from docwhat/spelling-booboo 
Rescuable spelling error
 2011-10-03 08:24:35 -07:00
Christian Höltje
bb5e295d94 Rescuable spelling error 2011-10-03 10:15:31 -04:00
Manuel Menezes de Sequeira
e3d4603151 Several small corrections and improvements to the Migrations and Active Record Basics guides. 2011-10-03 14:47:24 +01:00
Sam Pohlenz
6f429f375e Ensure that enhancements to assets:precompile task are only run once 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-03 11:18:49 +02:00
Sam Pohlenz
0e1f7e0058 Replace calls to capture(:stdout) with quietly in assets tests 
Signed-off-by: José Valim <jose.valim@gmail.com>
 2011-10-03 11:18:44 +02:00