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
26,219 Commits 34 Branches 105 Tags
970caea5bc1105e69acf46bbf9a9e73024b61625
Commit Graph

26219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vijay Dev
970caea5bc Merge pull request #3783 from HeeL/master 
fixed a typo in a travis message
 2011-11-28 07:18:22 -08:00
Sergey Parizhskiy
cc5f68d56b fixed a typo in a message when there is no failuresin a build 2011-11-28 16:45:40 +02:00
José Valim
f4ce002c0e Merge pull request #3278 from arunagw/rails_rake_task_warning 
Global variable `$rails_rake_task' not initialized Warning removed
 2011-11-28 04:25:55 -08:00
Arun Agrawal
8ef1ec427f global variable `$rails_rake_task' not initialized Warning removed 2011-11-28 17:35:10 +05:30
José Valim
5f75a92c32 Merge pull request #3657 from arunagw/mysql2_bump_master 
Bump Mysql2!
 2011-11-28 03:15:30 -08:00
Vijay Dev
9ca58ba492 Revert "use any? to check for size" 
This reverts commit c4af5f00f6.
 2011-11-28 16:29:55 +05:30
José Valim
89925e817c Revert "Use any instead of length" 
This reverts commit 1756629835.
 2011-11-28 11:18:39 +01:00
Xavier Noria
152bd3c510 Revert "Used any? instead of length call" 
Reason: This is slower, and any? is not equivalent in the
general case.

See discussion in https://github.com/rails/rails/pull/3779

This reverts commit 20cbf8eddc.
 2011-11-28 11:07:01 +01:00
José Valim
ad5c8b0d52 Merge pull request #3776 from nashby/add-namespace-to-form 
add namespace options to form_for
 2011-11-27 23:59:36 -08:00
Vasiliy Ermolovich
2559256963 update CHANGELOG 2011-11-28 10:54:12 +03:00
José Valim
5cf56a4e77 Merge pull request #3779 from rahul100885/rahul100885_work 
Used any? instead of length call
 2011-11-27 23:13:39 -08:00
Rahul P. Chaudhari
20cbf8eddc Used any? instead of length call 2011-11-28 12:07:31 +05:30
Jon Leighton
b00cf122e2 Merge pull request #3748 from samsonasu/has_many_custom_pk_new_record 
New records should load has_many relationships with custom primary keys
 2011-11-27 13:05:19 -08:00
Vasiliy Ermolovich
fb8b555c49 add namespace options to form_for 
You can provide a namespace for your form to ensure uniqueness of id attributes on form elements.
The namespace attribute will be prefixed with underscore on the generate HTML id
 2011-11-27 23:41:23 +03:00
Santiago Pastorino
af3aacaa47 Merge pull request #3773 from rahul100885/rahul100885_work 
Use any instead of length
 2011-11-27 12:11:41 -08:00
José Valim
0b7cd7b570 Merge pull request #3771 from kennyj/fix_rake_test_warnings 
Call a block passed rake_tasks method in the self context
 2011-11-27 11:25:07 -08:00
José Valim
e7e046fa1c Merge pull request #3769 from kennyj/fix_index_html 
avoid url started with "/" for the rails.png in public/index.html
 2011-11-27 07:12:15 -08:00
José Valim
ee8db25e64 Merge pull request #3772 from lest/label-with-block 
fix label with block in erb
 2011-11-27 06:47:32 -08:00
Rahul P. Chaudhari
1756629835 Use any instead of length 2011-11-27 20:02:09 +05:30
lest
bc81ba2451 fix label with block in erb 2011-11-27 16:59:44 +03:00
kennyj
7f8f554d75 Call a block passed rake_tasks method in the self context 2011-11-27 22:49:37 +09:00
kennyj
78ad94aaa7 avoid absolute path for the rails.png in index.html 2011-11-27 20:25:05 +09:00
Yehuda Katz
3c81fc3b91 Merge pull request #3767 from tadast/object_in 
Object#in? also accepts multiple parameters
 2011-11-26 18:10:48 -08:00
Tadas Tamošauskas
ebf69ab163 Object#in? also accepts multiple parameters 2011-11-26 23:51:09 +00:00
José Valim
71b387d91e Merge pull request #3765 from qoobaa/orm-instance-fix 
added tests to #3763
 2011-11-26 11:05:28 -08:00
Jakub Kuźma
4e5eaae1fa added tests, replaced classify with constantize - using classify here cuts the last 's' in ORM name 2011-11-26 19:57:51 +01:00
José Valim
140a0e49e5 Merge pull request #3763 from qoobaa/orm-instance-fix 
allow using orm_instance without invoking orm_class in generators
 2011-11-26 10:28:36 -08:00
Vijay Dev
d157ca881b add more tests for monday and sunday methods 2011-11-26 23:53:57 +05:30
Vijay Dev
9030cdadff Merge pull request #3764 from arunagw/test_sunday_monday 
Tests added for monday and sunday
 2011-11-26 10:18:07 -08:00
Vijay Dev
ab854db649 documenting monday and sunday methods 2011-11-26 23:43:52 +05:30
Arun Agrawal
cd6c5677fb Tests added for monday and sunday 
Reference commits : 
a8f2860d0e
80ac4dc6d0
 2011-11-26 23:37:01 +05:30
Vijay Dev
80ac4dc6d0 Adds Time#sunday method 2011-11-26 23:15:11 +05:30
Vijay Dev
a8f2860d0e Convert aliases monday and sunday to methods 
A recent change to beginning_of_week and end_of_week added an argument
that can be used to specify the week's starting day as a symbol. Now
these methods were aliased as monday and sunday respectively which as a
consequence of the argument addition, made calls like obj.monday(:sunday)
possible. This commit makes them methods on their own.
 2011-11-26 23:08:58 +05:30
Vijay Dev
8135e5e699 s/end_on_week/end_of_week 2011-11-26 22:06:47 +05:30
Vijay Dev
99ff8fdab5 minor doc changes 2011-11-26 22:06:47 +05:30
Jakub Kuźma
89d6db05d7 allow using orm_instance without invoking orm_class first in generators 2011-11-26 17:11:17 +01:00
José Valim
f754521675 Merge pull request #3760 from arunagw/warning_removed_unused_var 
Warning removed unused variable
 2011-11-26 06:35:42 -08:00
Arun Agrawal
9817a8b7d6 Warning removed unused variable 2011-11-26 19:30:11 +05:30
Vijay Dev
1d89540686 Merge branch 'master' of github.com:lifo/docrails 2011-11-26 19:14:39 +05:30
Vijay Dev
5c2a2ee76e rephrased ef38c3089e and 
mentioned about OS X and windows usually having a JS runtime
 2011-11-26 19:07:36 +05:30
Vijay Dev
c4af5f00f6 use any? to check for size 2011-11-26 18:52:10 +05:30
Xavier Noria
b6916e0b92 removes a Serialization constant left in the previous revert 2011-11-25 15:06:30 -08:00
Xavier Noria
b30b932447 finders guide: adds some pointers to help users interpret the output of EXPLAIN 2011-11-25 14:58:43 -08:00
Xavier Noria
1be9830d4d add the query to AR::Relation#explain output 
Rationale: this is more readable if serveral queries
are involved in one call. Also, it will be possible
to let AR log EXPLAINs automatically in production
mode, where queries are not even around.
 2011-11-25 14:29:34 -08:00
Xavier Noria
a5b362df56 some tweaks to PR#3547. [Closes #3547] 2011-11-25 12:02:49 -08:00
gregolsen
7a33a005d7 API docstrings updated with default value info 2011-11-25 12:02:49 -08:00
gregolsen
3f1a4c3415 beginning_of_week extended in both Time and Date so that to return week start based on start day that is monday by default 2011-11-25 12:02:49 -08:00
José Valim
0a4035b12a Revert the serializers API as other alternatives are now also under discussion 2011-11-25 19:29:39 +00:00
José Valim
2dab493867 Merge pull request #3756 from johnmdonahue/update-gem-action-linebreaks-and-indentation 
Updating newline fix to maintain existing linebreaks and indentation and...
 2011-11-25 09:44:14 -08:00
John Donahue
95e9b5fbfd Updating newline fix to maintain existing linebreaks and indentation and test for b/eol on inserts 2011-11-25 09:06:14 -08:00