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,181 Commits 34 Branches 105 Tags
448df2d100feccf1d5df9db2b02b732a775d8406
Commit Graph

26181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexey Vakhov
448df2d100 Cosmetic fixes in AM validatations docs 2011-11-27 10:23:40 +04:00
Arun Agrawal
fc20d6b681 Let's say this 3.1.3 instead of 3.1.1 in docs 2011-11-26 22:38:58 +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
José Valim
6f5fdf8179 Merge pull request #3747 from lest/middleware-logger 
middlewares should have configurable logger
 2011-11-25 05:33:26 -08:00
Uģis Ozols
a607a9d978 what's -> that's 2011-11-25 14:24:14 +02:00
Uģis Ozols
9a45867b09 Remove unnecessary comment. 2011-11-25 14:22:36 +02:00
Piotr Sarnacki
8ff8fa5e5f I suck, forgot to also change rake's task description 2011-11-25 12:54:39 +01:00
Piotr Sarnacki
c9bb099318 Display mounted engines in rake routes by default 2011-11-25 12:45:58 +01:00
lest
cd9d28d6fd middlewares should use logger from env 2011-11-25 13:09:46 +03:00
José Valim
fcacc6986a Merge branch 'serializers' 
This implements the ActiveModel::Serializer object. Includes code, tests, generators and guides.

From José and Yehuda with love.

Conflicts:
	railties/CHANGELOG.md
 2011-11-25 09:59:35 +00:00
José Valim
4565c871a6 Merge pull request #3752 from ganeshkumar/gem_lending 
Added tests for #3751
 2011-11-25 01:51:56 -08:00
José Valim
696d01f7f4 Add docs to serializers. Update CHANGELOGs. 2011-11-25 09:49:54 +00:00
ganesh
c8d7291b6b Added tests for #3751 2011-11-25 14:55:28 +05:30
José Valim
6d9f9b3b05 Add a hook for serializers in the scaffold generator (off for now). 2011-11-25 09:17:32 +00:00
José Valim
ebb8ea22f3 Add generators for serializers. 2011-11-25 09:14:05 +00:00
Piotr Sarnacki
0cd3bf8406 Allow to display engine's routes when running rake routes ENGINES=true 2011-11-24 16:16:00 +01:00
Piotr Sarnacki
30cf3e16a0 Merge pull request #3746 from qoobaa/active-model-naming-with-anonymous-classes 
make ActiveModel::Name fail gracefully with anonymous classes
 2011-11-24 06:56:46 -08:00
Jakub Kuźma
dc39af0a9a make ActiveModel::Name fail gracefully with anonymous classes 2011-11-24 15:50:21 +01:00
Piotr Sarnacki
a478389b7d Forgot to add CHANGELOG entry for config.railties_order 2011-11-24 13:40:27 +01:00
rpq
510502ee3a comma 2011-11-23 23:26:17 -05:00
Michael Pearson
ef38c3089e Move JS runtime instructions to where the error would be encountered, remove gem install. 2011-11-24 10:59:29 +11:00
José Valim
28bcda4098 Rename UserSerializer to DefaultUserSerializer in tests. 2011-11-23 23:53:20 +00:00
José Valim
7fcc8c0a1f Rely solely on active_model_serializer and remove the fancy constant lookup. 2011-11-23 23:45:27 +00:00
Michael Pearson
0e7443060b Add step to getting_started to install JS Runtime. 
abstrakt on #rubyonrails found that the guide, when followed step by step,
does fails at the 'rails server' command due to a lacking JS runtime.
 2011-11-24 10:33:04 +11:00
José Valim
6da52c617e Remove listings from the serialization guide that won't make 3.2. 2011-11-23 23:22:46 +00:00
José Valim
8896b4fdc8 Implement ArraySerializer and move old serialization API to a new namespace. 
The following constants were renamed:

  ActiveModel::Serialization     => ActiveModel::Serializable
  ActiveModel::Serializers::JSON => ActiveModel::Serializable::JSON
  ActiveModel::Serializers::Xml  => ActiveModel::Serializable::XML

The main motivation for such a change is that `ActiveModel::Serializers::JSON`
was not actually a serializer, but a module that when included allows the target to be serializable to JSON.

With such changes, we were able to clean up the namespace to add true serializers as the ArraySerializer.
 2011-11-23 23:18:15 +00:00
José Valim
0536ea8c78 Add safe_constantize to ActiveSupport::Dependencies. 2011-11-23 21:43:03 +00:00
José Valim
e6cfd85361 Merge pull request #3739 from lest/config-always-write-cookie 
configuration option to always write cookie
 2011-11-23 12:58:56 -08:00
lest
98a1717e7c configuration option to always write cookie 2011-11-23 23:50:04 +03:00
José Valim
e62de52aa3 Merge branch 'master' into serializers 2011-11-23 20:43:06 +00:00
Piotr Sarnacki
40b19e0635 Allow to change engine's loading priority with config.railties_order= 2011-11-23 21:36:33 +01:00
Yehuda Katz
8549f7a4f0 Merge pull request #3731 from HeeL/master 
code stats calculation
 2011-11-23 11:11:40 -08:00
Yehuda Katz
e9f63c55f8 Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_test 
Warnings removed. (ambiguous first argument)
 2011-11-23 11:10:27 -08:00
José Valim
fd86a1b6b0 Rely on a public contract between railties instead of accessing railtie methods directly. 2011-11-23 19:06:45 +00:00
José Valim
3ee0116c94 Optimize cache expansion by skipping rails cache id in nested keys. 2011-11-23 18:22:09 +00:00
José Valim
2c568f1e45 Merge pull request #3738 from exviva/issues/3737_AS_cache_expand_cache_key 
Issues/3737 AS::Cache.expand_cache_key
 2011-11-23 10:17:34 -08:00
José Valim
f62f545f7c Merge pull request #3735 from kennyj/fix_3728 
Fix #3728 Remove unreachable code, and add additional testcases.
 2011-11-23 09:55:31 -08:00
Olek Janiszewski
a650dd05f8 Fix #3737 AS::expand_cache_key generates wrong key in certain situations (part 2) 
`nil` and `false` both expand to `""` (empty string), while `true` expands to
`"true"`; `false` should expand to `"false"`
 2011-11-23 18:11:38 +01:00
Olek Janiszewski
d8e6dc9cf1 Fix #3737 AS::expand_cache_key generates wrong key in certain situations 
`cache_key` method is never called when the argument is a 1-element array
with something that responds to `cache_key`
 2011-11-23 18:06:16 +01:00