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
23,079 Commits 34 Branches 105 Tags
7b4cd4bb5bfd169404d501fde29fe237eeecebfa
Commit Graph

23079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Noel Gomez
7b4cd4bb5b Modified generated text to explain where .js and .coffee files can be located and that there shouldn't be blank lines in manifest per this issue http://groups.google.com/group/rubyonrails-talk/browse_thread/thread/effb868290c2c0b8 2011-05-31 22:45:31 +02:00
Noel Gomez
2183f05864 changed text to be more explicit about where stylesheets can be located 2011-05-31 22:45:31 +02:00
Jon Leighton
fbe012e92d Ensure that calculations properly override the select value even if it's set in the default scope. Fixes #1395. 2011-05-31 21:12:20 +01:00
Erik Fonselius
a5806fa409 Failing test for aggregating on default_scope with select 2011-05-31 20:47:30 +01:00
Jon Leighton
dfaad4f5a7 Only save the record once when calling create! on a collection association. Fixes #1360. 2011-05-31 20:32:09 +01:00
Farley Knight
aa316e27b7 Tests for issue #1360 2011-05-31 19:47:34 +01:00
Jon Leighton
60cb96abea Implementing @dmathieu's cleaner fix from #1425. Unfortunately he deleted the branch so I cannot just merge it. 2011-05-31 18:34:27 +01:00
Jon Leighton
0bb8429e71 Reduce test noise 2011-05-31 18:18:14 +01:00
Aaron Patterson
021e4f16b7 Merge pull request #1417 from arunagw/nested_attributes_fix 
Fix nested attribute for memory record.
 2011-05-31 08:46:27 -07:00
José Valim
12786518f1 Update CHANGELOG. 2011-05-31 12:26:32 +02:00
José Valim
139a9f7011 Transform the symbol into a constant lookup. 2011-05-31 12:24:30 +02:00
José Valim
1638435152 Merge pull request #1403 from bogdan/config 
ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer method
 2011-05-31 03:09:23 -07:00
Arun Agrawal
e04f2c1d42 Opening class CascadedEagerLoadingTest at once. 2011-05-31 12:35:37 +05:30
José Valim
752dec941e Merge pull request #1415 from brainopia/master 
Remove autoload for non-existing constants
 2011-05-30 23:56:49 -07:00
Arun Agrawal
2e57b66931 Adding comment to work with 1.8.7. Nested Attribute fix. 2011-05-31 12:12:19 +05:30
Arun Agrawal
cfb5f1b608 Fix nested attribute for memory record. 2011-05-31 11:31:10 +05:30
brainopia
c2687c390f Remove autoload for a couple of constants which don't exist anymore 2011-05-31 06:22:09 +04:00
Aaron Patterson
7278547a5d Merge pull request #1410 from lucasts/pg_schema 
a little step to better postgresql schema support in rails
 2011-05-30 13:30:07 -07:00
José Valim
65858a4bed Merge pull request #1404 from commuter/plugin_new_generator_should_properly_require_js 
properly require javascript libraries when generating mountable engine
 2011-05-30 08:17:13 -07:00
Joshua Peek
862390542d Merge pull request #1355 from gnufied/master 
Adds rake task to cleanup compiled assets
 2011-05-30 06:46:50 -07:00
J. Edward Dewyea
baf2a9cb7f properly require javascript libraries when generating mountable engine 2011-05-30 05:58:39 -04:00
Bogdan Gusiev
aa2639e746 ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer method 
In order to specify your own sanitize method
Implemented .mass_assignment_sanitizer configuration option
 2011-05-30 11:34:00 +03:00
Vishnu Atrai
f4a2b9ee85 refectored assets:clean task 2011-05-30 11:26:11 +05:30
Aaron Patterson
96525d632d avoid creating range objects 2011-05-29 13:37:42 -07:00
Aaron Patterson
eb3f81f9dc Merge pull request #1398 from leereilly/my_new_branch 
Corrected some typos and American vs. Queen's English issues
 2011-05-29 12:46:35 -07:00
Lee Reilly
4f234bfd79 Corrected some typos and American vs. Queen's English issues 2011-05-29 12:40:24 -07:00
Aaron Patterson
18b153d15d Merge pull request #1384 from amatsuda/simplify_drop_table 
Remove unused options from drop_table
 2011-05-28 13:36:40 -07:00
José Valim
a1b1f91e06 Merge pull request #1380 from vijaydev/session_migration 
Use 3.1 style migration for sessions table
 2011-05-28 12:45:14 -07:00
José Valim
a46b03e728 Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-tests 
Stringify param values in controller tests.
 2011-05-28 12:43:13 -07:00
Akira Matsuda
bcb466c543 No need to pass options which is never used 2011-05-29 04:30:22 +09:00
Akira Matsuda
d8f4988867 No need to override for just calling super 2011-05-29 04:29:19 +09:00
Vijay Dev
995ea00328 Use change in place of up and down in sessions table migration 2011-05-28 21:59:54 +05:30
José Valim
2fd7ea97ec Merge pull request #1378 from AndrewRadev/master 
Add changelog entry for pull request #1359
 2011-05-28 07:51:43 -07:00
Andrew Radev
1cd235ecdd ActiveSupport CHANGELOG entry moved to correct place 2011-05-28 17:23:45 +03:00
Andrew Radev
07a353dde1 Update CHANGELOG for ActiveSupport::OrderedHash change 2011-05-28 16:21:16 +03:00
José Valim
429a1f2d4a Merge pull request #1373 from anbotero/master 
Minor typo corrected
 2011-05-28 00:53:50 -07:00
Andrés Botero
5a5736d735 Fix typo in test. 2011-05-28 00:51:00 -07:00
José Valim
f07ff6b8fb Merge pull request #1372 from jacott/master 
Fix for relative_url_root when used with sprockets
 2011-05-27 23:46:39 -07:00
jacott
db5adf2d42 fixed asset_paths when called from sprockets for relative_url_root 2011-05-28 18:19:11 +12:00
Xavier Noria
6a3eabe96b Merge pull request #1371 from FLOChip/typo 
Typo in ActionMailer::Base
 2011-05-27 23:14:45 -07:00
Teng Siong Ong
9a67a117b3 minor typo in the rdoc about Interceptor. 2011-05-28 13:58:47 +08:00
Teng Siong Ong
0f0213f490 minor spacing fix in code example in ActionMailer::Base. 2011-05-28 13:58:02 +08:00
Aaron Patterson
b7baf1211f Merge pull request #1368 from amatsuda/disable_im_by_default_on_test 
Disable IdentityMap by default for ActiveRecord testing
 2011-05-27 18:07:50 -07:00
Akira Matsuda
9fb51e76fd Disable IdentityMap by default for ActiveRecord testing 
because enabling IM by default will possibly hide some bugs on 3.1 default behavior
 2011-05-28 09:08:13 +09:00
Aaron Patterson
c122c7b271 stop using boolean expressions because of the side effects 2011-05-27 14:53:20 -07:00
Aaron Patterson
4b536f7591 Merge pull request #1365 from gnufied/sqlite3 
close statment only if its not closed
 2011-05-27 14:40:32 -07:00
Aaron Patterson
2a9b3abe19 Merge pull request #1229 from workmad3/master 
Fix for Issue #1205
 2011-05-27 14:34:05 -07:00
Hemant Kumar
ed1a0672ab delegate connection and column_hash calls directly to model 2011-05-28 03:00:11 +05:30
Hemant Kumar
d48add714d close statment only if its not closed 2011-05-28 02:57:36 +05:30
Aaron Patterson
985ace4d7f work around bug in the sqlite3 bindings. fixes #1289 2011-05-27 14:12:28 -07:00