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
21,230 Commits 34 Branches 105 Tags
0c777bace2aed1833e068358461de62bbd59cd0c
Commit Graph

21230 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Patterson
0c777bace2 stop being clever and just call methods on the Route object 2011-03-08 16:18:27 -08:00
Aaron Patterson
f975626dc1 test/unit in ruby trunk adds a new instance variable. YAY! 2011-03-08 14:09:44 -08:00
Mat Brown
fb34f8577c Rename conflicting ActionMailer::MailHelper#simple_format method 
This was conflicting with ActionView::Helpers::TextHelper#simple_format
from within email templates.
 2011-03-09 05:49:01 +08:00
Chris Kalafarski
092538045e The root route example was the only using double quotes; switched it to single quotes for consistency 2011-03-08 09:55:57 -05:00
Aaron Pfeifer
9798ee2619 Add better test scenario for around callback return results 2011-03-08 15:01:06 +08:00
Aaron Pfeifer
df615f127e Allow access to a callback event's return result from around callbacks 2011-03-08 15:01:05 +08:00
Aaron Patterson
1408b942d9 removing stubs. 1.9.3 implements Date.today in C so mocking the return value of Time.now does nothing 2011-03-07 15:44:39 -08:00
Aaron Patterson
33f222b9e1 fixing some tests on ruby 1.9.3 2011-03-07 14:01:51 -08:00
Xavier Noria
a0d7247d15 reorganizes the RDoc of Hash#to_param 2011-03-07 22:20:24 +01:00
Xavier Noria
89ecc0a5dc Merge branch 'master' of git://github.com/lifo/docrails 2011-03-07 22:11:47 +01:00
Vijay Dev
f99db5a6a8 formatting changes 2011-03-07 23:56:16 +05:30
Aaron Patterson
5968d7a658 do not test explicit equality of predicate methods, they should be allowed to return truthy or falsey objects 2011-03-07 09:36:07 -08:00
Aaron Patterson
a032212e7c refactor calls to to_param in expand_key method 2011-03-07 09:33:19 -08:00
Jon Leighton
532f915037 Referencing a table via the ON condition in a join should force that table to be eager-loaded via a JOIN rather than via subsequent queries. 2011-03-07 08:51:17 -08:00
Aaron Patterson
9cee693213 Merge branch 'master' of github.com:rails/rails 
* 'master' of github.com:rails/rails: (44 commits)
  Fixed indentation in actionmailer base_test [#6538 state:committed]
  remove unused assigned variable
  removes merge conflicts
  removes Examples headers introduced in 9b96de6
  Revert "Fixed identation in actionmailer base_test"
  Report the correct value of nil.id in the exception message as different ruby implementations may have different values, for example Rubinius returns 53 for nil.id.
  Improve testing of cookies in functional tests: - cookies can be set using string or symbol keys - cookies are preserved across calls to get, post, etc. - cookie names and values are escaped - cookies can be cleared using @request.cookies.clear
  more style changes
  Some style changes
  style changes
  Revert "style changes"
  Raise ArgumentError if route name is invalid [#6517 state:resolved]
  style changes
  Allow model to be inherited from Hash [#6487 state:resolved]
  styles applied for usage
  added failing test for fields_for with a record object that inherits from Hash
  Fixed identation in actionmailer base_test
  wrong SQL statement
  commas to set off expressions that interrupt sentence flow
  typo changes
  ...
 2011-03-07 08:50:50 -08:00
Xavier Noria
2159e9eb64 Merge branch 'active_model_unused_variable' of https://github.com/pacoguzman/rails into pacoguzman-active_model_unused_variable 2011-03-07 00:44:57 +01:00
Dalibor Nasevic
c528297d17 Fixed indentation in actionmailer base_test [#6538 state:committed] 
Signed-off-by: Xavier Noria <fxn@hashref.com>
 2011-03-07 00:37:45 +01:00
Dalibor Nasevic
55d2a211d3 Improved docs for Hash#to_param method 2011-03-06 23:54:18 +01:00
Paco Guzman
8e0affbd86 Configuration options are symbols 2011-03-06 22:35:26 +01:00
Paco Guzman
14c254aba3 Remove Example headers. Code just flows with the text. 6ce844a3 2011-03-06 22:34:01 +01:00
Paco Guzman
7e9d45cc7f remove unused assigned variable 2011-03-06 22:24:22 +01:00
Akira Matsuda
071ddb8281 more "SSL everywhere" for GitHub URLs 
see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere
 2011-03-07 06:18:32 +09:00
Akira Matsuda
5bed37779a "SSL everywhere" for GitHub URLs 
see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere
 2011-03-07 05:56:02 +09:00
Akira Matsuda
112c802579 s/a/an/ 2011-03-07 05:52:47 +09:00
Akira Matsuda
d91be36598 fix typos 2011-03-07 05:21:25 +09:00
Xavier Noria
3a621e7be4 removes merge conflicts 2011-03-06 20:34:56 +01:00
Xavier Noria
89d825d021 Merge branch 'master' of git://github.com/lifo/docrails 2011-03-06 17:52:30 +01:00
Xavier Noria
6ce844a3c1 removes Examples headers introduced in 9b96de6 
Example headers are discouraged in the API guidelines.
Code just flows with the text. They may be good in
places where there's a lot of stuff and structure may
add clarity
 2011-03-06 17:49:39 +01:00
Xavier Noria
8bbc5b4f5f Revert "Fixed identation in actionmailer base_test" 
Please excuse the revert. Albeit the commit is totally
innocent, docrails has a strong no-code policy we need
to enforce. Please feel free to submit the fix as a
patch and assign it to me, I'll apply right away.

This reverts commit d8462510c5.
 2011-03-06 17:42:42 +01:00
Andrew White
5e7ce47fb9 Report the correct value of nil.id in the exception message 
as different ruby implementations may have different values,
for example Rubinius returns 53 for nil.id.

[#6444 state:resolved]
 2011-03-06 15:23:31 +00:00
Andrew White
31f09f9dbc Improve testing of cookies in functional tests: 
- cookies can be set using string or symbol keys
- cookies are preserved across calls to get, post, etc.
- cookie names and values are escaped
- cookies can be cleared using @request.cookies.clear

[#6272 state:resolved]
 2011-03-06 12:49:44 +00:00
suchasurge
b99fb66fb7 more style changes 2011-03-06 10:44:52 +01:00
suchasurge
9b96de6f3d Some style changes 2011-03-06 10:26:24 +01:00
JudeArasu
ac59a2a1d6 style changes 2011-03-06 12:55:56 +05:30
JudeArasu
2cd3dcabe2 Revert "style changes" 
This reverts commit 1d4826937e.
 2011-03-06 12:53:23 +05:30
Andrew White
e00867bc43 Raise ArgumentError if route name is invalid [#6517 state:resolved] 2011-03-06 07:08:50 +00:00
JudeArasu
1d4826937e style changes 2011-03-06 11:38:18 +05:30
Alexander Uvarov
0509bf35f1 Allow model to be inherited from Hash [#6487 state:resolved] 
Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
 2011-03-06 05:28:35 +00:00
JudeArasu
e80db417ed styles applied for usage 2011-03-06 10:53:44 +05:30
Diego Carrion
dff73dec22 added failing test for fields_for with a record object that inherits from Hash 
Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
 2011-03-06 05:18:56 +00:00
Aaron Patterson
09d3e89cf0 use sort_by instead of sort() 2011-03-05 20:01:06 -08:00
Dalibor Nasevic
d8462510c5 Fixed identation in actionmailer base_test 2011-03-06 00:27:37 +01:00
Aaron Patterson
74818a3543 use Arel::Table#alias rather than passing the :as parameter 2011-03-05 11:56:24 -08:00
Akira Matsuda
22faa2c86d wrong SQL statement 2011-03-06 03:29:23 +09:00
Xavier Noria
9092052cb0 merges rails 2011-03-05 12:06:43 +01:00
Xavier Noria
2076817629 revises the RDoc of Hash#reverse_merge 2011-03-05 11:57:32 +01:00
Xavier Noria
f6a5449d43 copy-edits 819762c 
* simplifies some sentences
* use a more neutral language with less you/yours
 2011-03-05 11:57:32 +01:00
Xavier Noria
5f99a899a8 copy-edits 108561f 2011-03-05 11:57:32 +01:00
JudeArasu
b12a4a9296 typo changes 2011-03-05 11:57:32 +01:00
R.T. Lechow
737abe4b4d Railties typos. 2011-03-05 11:56:35 +01:00