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,194 Commits 34 Branches 105 Tags
4cee36044bce89a46b8a8ea00289cd576905908d
Commit Graph

23194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Santiago Pastorino
4cee36044b Merge pull request #1885 from guilleiguaran/3-1-stable 
Bump ARel to 2.1.3 (3-1-stable)
 2011-06-28 14:59:10 -07:00
Guillermo Iguaran
4b12d7f369 Bump ARel to 2.1.3 2011-06-28 16:04:30 -05:00
Raimonds Simanovskis
cbf3e33176 Fix test_finding_with_cross_table_order_and_limit for Oracle 
Use latest Arel syntax and pass each order by expression as separate argument to order method as otherwise invalid Oracle SQL is generated.
 2011-06-28 13:49:35 -07:00
Ernie Miller
c26c273761 Support reversal of ARel orderings in reverse_sql_order 2011-06-28 13:12:58 -07:00
Vijay Dev
eb3e523434 record unsupported methods in CommandRecorder instead of letting the unsupported methods go through to the underlying db causing errors like duplicate columns to occur when rolling back migrations 2011-06-28 12:05:52 -07:00
Damien Mathieu
f170045c59 comparing different classes returns nil 2011-06-28 11:47:37 -07:00
Damien Mathieu
c5b43afd6c allow comparison on model objects - Closes #1858 2011-06-28 11:47:32 -07:00
Aaron Patterson
e0fae7265f remove useless assignment 2011-06-28 10:58:08 -07:00
Aaron Patterson
d8646163e5 lock_optimistically is typically true, so evaluate the common failure case first 2011-06-28 10:51:32 -07:00
Aaron Patterson
558b5bb490 reduce object allocation during AR instantiation 2011-06-28 10:22:47 -07:00
Aaron Patterson
196f92f366 remove the check for needs_type_condition? because ensure_proper_type will pick up the type column 2011-06-27 20:44:49 -07:00
Aaron Patterson
992b3b5e06 stop using && for the short circuit side effect 2011-06-27 18:16:16 -07:00
Aaron Patterson
5d954b4e38 let strings be converted to symbols inside the interpreter 2011-06-27 18:16:12 -07:00
Aaron Patterson
9fd0d91b26 avoice paying hash cost if there are no serialized attributes 2011-06-27 17:47:13 -07:00
Aaron Patterson
2fe088a53d cache column defaults for AR object instantiation 2011-06-27 17:47:09 -07:00
Aaron Patterson
b927f0a894 AR object instantiation is ~30% faster in the simple case 2011-06-27 16:15:44 -07:00
Aaron Patterson
0de56aac7f initialize instance variables 2011-06-27 14:47:32 -07:00
Aaron Patterson
3a14e6fdd5 oops! remove debugging codes 2011-06-27 14:47:27 -07:00
Aaron Patterson
0abb7b8c39 default create_with_value to a hash so we can eliminate conditionals, add test surrounding create_with(nil) behavior 2011-06-27 14:19:22 -07:00
Xavier Noria
3f759bfa7d the generated ALT attribute for images no longer contains the digest, if any 2011-06-27 23:00:52 +02:00
David Heinemeier Hansson
7d0c725a49 Merge pull request #1699 from chriseppstein/asset_urls 
asset_path will now use asset_host definition
 2011-06-27 12:19:56 -07:00
José Valim
0f128b1f67 Skip if it is actually a pluralize scheme. 2011-06-27 11:27:39 -07:00
José Valim
14cfc4503d Edited railties/lib/rails/paths.rb via GitHub 2011-06-27 09:55:28 -07:00
Chris Eppstein
4b8bd7a54f Merge remote-tracking branch 'rails/3-1-stable' into asset_urls 
* rails/3-1-stable: (49 commits)
  Add JavaScript Runtime name to the Rails Info properties (thanks Sam Ruby)
  Merge pull request #1481 from arunagw/lib_assets
  Improve ordering of multiple columns on postgresql
  judgement -> judgment, according to guidelines
  Follow rails convention by using Array.wrap
  Allow to specify mass-assignment roles as array
  Apply the default scope earlier when doing calculations. Fixes #1682.
  updated rspec link
  grammar changes in named routes description and clarity around possibilities for options
  font style changes in perf guide
  grammar changes to log subscriber docs
  move example code to be above reconfiguring discussion; add clarity about silencers and filters; misc grammar changes - for backtrace cleaners
  Fixed typo
  use present tense on examples
  more detail on how the flow between redirect and show works, and minor grammar
  remove extra space and clarify how an exception is made for controller wide layouts
  reorder layout selection examples to occur in the order that the code does, and provide more detail on why each selection is made
  singularize module and be explicit about what is delivered
  grammar (missing "a") and formatting
  elaborate details on why to use _url instead of _path in mailers
  ...

Conflicts:
	actionpack/lib/action_view/helpers/asset_paths.rb
	actionpack/lib/sprockets/helpers/rails_helper.rb
 2011-06-27 08:56:37 -07:00
David Heinemeier Hansson
94c08a6f95 Add JavaScript Runtime name to the Rails Info properties (thanks Sam Ruby) 2011-06-27 11:59:23 +02:00
David Heinemeier Hansson
7423e22092 Merge pull request #1481 from arunagw/lib_assets 
Generating /lib/assets  for assets
 2011-06-27 11:49:42 +02:00
Santiago Pastorino
54531b87b6 Merge pull request #1849 from raviolicode/postgresql-fix-3-1 
[3-1-stable] Fix for complex ordering of multiple columns on postgresql
 2011-06-24 15:05:44 -07:00
Lucia Escanellas
975ff5debb Improve ordering of multiple columns on postgresql 
* Only on postgresql, order("first asc, second asc") was invalid
* Closes #1720
 2011-06-24 17:48:22 -03:00
Santiago Pastorino
e65f11494c Merge pull request #1844 from jeroenj/cachesweeper-fix-3-1 
Fixes an issue where cache sweepers
 2011-06-24 08:44:42 -07:00
Xavier Noria
2bdc381483 judgement -> judgment, according to guidelines 2011-06-24 17:19:42 +02:00
José Valim
c8ff12ca97 Merge pull request #1839 from wildchild/3-1-stable 
Allow to specify roles for mass-assignment as array
 2011-06-23 18:34:06 -07:00
Alexander Uvarov
79956db91c Follow rails convention by using Array.wrap 2011-06-24 03:27:54 +06:00
Alexander Uvarov
52302f0856 Allow to specify mass-assignment roles as array 2011-06-24 03:20:28 +06:00
Jon Leighton
03580e0fa3 Apply the default scope earlier when doing calculations. Fixes #1682. 2011-06-23 19:58:15 +01:00
Mikhail Dieterle
43141e9a17 updated rspec link 2011-06-23 18:18:13 +02:00
Matt Jankowski
bad16df756 grammar changes in named routes description and clarity around possibilities for options 2011-06-23 18:18:07 +02:00
Vijay Dev
e002cf2fa6 font style changes in perf guide 2011-06-23 18:18:02 +02:00
Matt Jankowski
3cebef78c2 grammar changes to log subscriber docs 2011-06-23 18:17:57 +02:00
Matt Jankowski
eaee931f5d move example code to be above reconfiguring discussion; add clarity about silencers and filters; misc grammar changes - for backtrace cleaners 2011-06-23 18:17:51 +02:00
Mikhail Dieterle
6d4e3f3a0a Fixed typo 2011-06-23 18:17:46 +02:00
Matt Jankowski
877153843a use present tense on examples 2011-06-23 18:17:39 +02:00
Matt Jankowski
56cf974dbc more detail on how the flow between redirect and show works, and minor grammar 2011-06-23 18:17:34 +02:00
Matt Jankowski
26284ad475 remove extra space and clarify how an exception is made for controller wide layouts 2011-06-23 18:17:28 +02:00
Matt Jankowski
cf1341f386 reorder layout selection examples to occur in the order that the code does, and provide more detail on why each selection is made 2011-06-23 18:17:23 +02:00
Matt Jankowski
b3d8e50d4c singularize module and be explicit about what is delivered 2011-06-23 18:17:17 +02:00
Matt Jankowski
30ac5fffec grammar (missing "a") and formatting 2011-06-23 18:17:11 +02:00
Matt Jankowski
bb679d2cae elaborate details on why to use _url instead of _path in mailers 2011-06-23 18:16:50 +02:00
Arun Agrawal
57bdf7eabf Closing </yaml> 2011-06-23 18:16:23 +02:00
Vijay Dev
ae8d53e586 document Active Record's reverse_order method 2011-06-23 18:16:17 +02:00
Vijay Dev
741a417c72 AR: use where in place of find 2011-06-23 18:16:10 +02:00