Xavier Noria
|
f7f9003cd5
|
Merge pull request #2616 from tilsammans/patch-2
Removed my name from the changelog as the amount of blogspam became ridic
|
2011-08-23 05:27:11 -07:00 |
|
Joost Baaij
|
707378c489
|
removed the link to my blog to help stop endless comments
|
2011-08-23 14:18:06 +02:00 |
|
Joost Baaij
|
c46befbce3
|
Revert "Removed my name from the changelog as the amount of blogspam became ridiculous.
"
This reverts commit 95bece9155.
|
2011-08-23 14:17:29 +02:00 |
|
Xavier Noria
|
45f8ca54c9
|
Merge pull request #2653 from luckydev/ser-wrap
Missing require array/wrap in serialization
|
2011-08-23 04:05:34 -07:00 |
|
Xavier Noria
|
eb18f3d746
|
Merge pull request #2652 from dasch/remove-trailing-whitespace
Remove trailing whitespace
|
2011-08-23 04:00:59 -07:00 |
|
Anand
|
1be3442a0a
|
added missing require array/wrap in serialization
|
2011-08-23 16:30:02 +05:30 |
|
José Valim
|
5536d901e5
|
Merge pull request #2651 from luckydev/serialization-tests
More tests for only-include and except-include options in serialization
|
2011-08-23 03:55:24 -07:00 |
|
Daniel Schierbeck
|
cacdbb9437
|
Remove trailing whitespace
|
2011-08-23 12:39:07 +02:00 |
|
Anand
|
56e32ad40f
|
added more tests for only-include and except-include options in serialization
|
2011-08-23 16:03:58 +05:30 |
|
Andrew White
|
14cf4b2e35
|
Don't modify params in place - fixes #2624
|
2011-08-23 11:07:37 +01:00 |
|
Aaron Patterson
|
7079701e5b
|
Merge pull request #2646 from guilleiguaran/add-destroy-alias-to-engine
Add destroy alias to engines
|
2011-08-22 22:54:42 -07:00 |
|
Guillermo Iguaran
|
d17954c7d8
|
Add destroy alias to engines
|
2011-08-22 23:39:17 -05:00 |
|
Santiago Pastorino
|
0b6da0c654
|
Merge pull request #2411 from ai/debug_assets_by_config
Debug assets by config
|
2011-08-22 11:50:27 -07:00 |
|
Aaron Patterson
|
999e7ea47d
|
Merge pull request #2627 from luckydev/tr
travis status image added
|
2011-08-22 11:29:01 -07:00 |
|
Aaron Patterson
|
d7ec3ee9ae
|
Merge pull request #2611 from ognevsky/add-destroy-alias
Added destroy alias to rails generator
|
2011-08-22 11:28:26 -07:00 |
|
Santiago Pastorino
|
0942879a52
|
Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251
Use mysql_creation_options inside rescue block
|
2011-08-22 10:36:12 -07:00 |
|
Joshua Peek
|
cfb5e14f5d
|
Merge pull request #2634 from guilleiguaran/fix-sprockets-rewrite-asset-path
Fix Sprockets rewrite_asset_path
|
2011-08-22 10:24:16 -07:00 |
|
Anand
|
71232f5d5d
|
Travis status image added to GitHub README, excluding API pages.
|
2011-08-22 22:28:02 +05:30 |
|
Guillermo Iguaran
|
e1f11ff37f
|
Fix Sprockets rewrite_asset_path
|
2011-08-22 11:12:54 -05:00 |
|
Santiago Pastorino
|
041f1c7192
|
Merge pull request #2631 from dasch/refactor-sprockets
Refactor Sprockets::Helpers::RailsHelper#performing_caching?
|
2011-08-22 08:11:35 -07:00 |
|
Daniel Schierbeck
|
db181bddb6
|
Refactor Sprockets::Helpers::RailsHelper#performing_caching?
No need for them lines to get so long! Also, move that comment into
the method body where it belongs!
|
2011-08-22 16:50:33 +02:00 |
|
Andrey Ognevsky
|
44f0d94469
|
Add Destroy Alias
* Added destroy alias to rails generator
* add alias info for destroy command
* Updated command line guides
|
2011-08-22 17:46:10 +03:00 |
|
Aaron Patterson
|
aae5ebf3eb
|
Merge pull request #2618 from FLOChip/unicode_j
fix escape_javascript for unicode character \u2028.
|
2011-08-21 18:42:17 -07:00 |
|
Santiago Pastorino
|
35c8a896fc
|
Merge pull request #2620 from cesario/3-1-0
Fix CI and rename 1 misleading test case.
|
2011-08-21 19:59:09 -03:00 |
|
Andrey A.I. Sitnik
|
18b2223b32
|
Allow to debug assets by config.assets.debug
|
2011-08-22 09:36:36 +11:00 |
|
Joshua Peek
|
63d3809e31
|
Fix sprockets warnings
Fixes #2598
|
2011-08-21 16:42:06 -05:00 |
|
Joost Baaij
|
95bece9155
|
Removed my name from the changelog as the amount of blogspam became ridiculous.
When will docrails be back? :-p
|
2011-08-22 00:10:01 +03:00 |
|
Teng Siong Ong
|
f6ceb944ea
|
fix escape_javascript for unicode character \u2028.
|
2011-08-21 15:14:45 -05:00 |
|
Xavier Noria
|
f25d65d2fb
|
Merge pull request #2610 from asmega/documentation
added link to url_for in documentation
|
2011-08-21 09:17:47 -07:00 |
|
asmega
|
ebe9155313
|
Use typewriter styling on url_for in documentation
|
2011-08-21 16:40:56 +01:00 |
|
Santiago Pastorino
|
83b91c1fd4
|
Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14
Bump sprockets to 2.0.0.beta.14
|
2011-08-21 07:36:02 -07:00 |
|
Xavier Noria
|
74b57b387f
|
Merge pull request #2600 from al/finder_sql_example_update
Updated the docs for the has_many :finder_sql option
|
2011-08-21 04:36:12 -07:00 |
|
Guillermo Iguaran
|
f71c481545
|
Bump sprockets to 2.0.0.beta.14
|
2011-08-20 17:10:45 -05:00 |
|
Santiago Pastorino
|
165fb830d0
|
Merge pull request #2596 from dharmatech/patch-1
ActionController::Redirecting : fix docs typo
|
2011-08-20 14:16:15 -07:00 |
|
Santiago Pastorino
|
1299640ea5
|
Merge pull request #2595 from smartinez87/assets-guide
Document debugging assets set by default for dev and test envs on guides
|
2011-08-20 14:15:47 -07:00 |
|
Santiago Pastorino
|
71ef72c3d0
|
Merge pull request #2597 from dharmatech/patch-2
actionpack/lib/action_controller/base.rb: docs typo
|
2011-08-20 14:14:54 -07:00 |
|
Santiago Pastorino
|
77dfcae385
|
Merge pull request #2604 from vijaydev/params_wrapper_docs
Minor edit in the params wrapper api docs
|
2011-08-20 12:20:53 -07:00 |
|
Vijay Dev
|
7da70a431c
|
params wrapper docs correction
|
2011-08-21 00:25:58 +05:30 |
|
Aaron Patterson
|
257366d118
|
Merge pull request #2602 from ernie/fix_predicate_builder_primary_key_assumption
Fix assumption of primary key name in PredicateBuilder subquery.
|
2011-08-20 11:49:17 -07:00 |
|
Alan Larkin
|
dbe9a9b482
|
Updated the docs for the has_many :finder_sql option to reflect changes made in #a7e19b30ca71f62af516, i.e. the use of Procs when interpolation of the SQL is required.
|
2011-08-20 19:42:07 +01:00 |
|
Santiago Pastorino
|
9ca44e36d3
|
Merge pull request #2603 from vijaydev/guides
Minor change in the 3.1 release notes
|
2011-08-20 11:38:45 -07:00 |
|
Vijay Dev
|
7444c620cf
|
minor change in the 3.1 release notes
|
2011-08-20 23:27:31 +05:30 |
|
Ernie Miller
|
f74f5f7f00
|
Fix PredicateBuilder clobbering select_values in subquery.
|
2011-08-20 13:16:39 -04:00 |
|
Ernie Miller
|
e2ae015952
|
Fix assumption of primary key name in PredicateBuilder subquery.
|
2011-08-20 13:00:26 -04:00 |
|
dharmatech
|
dfd03fdbd3
|
actionpack/lib/action_controller/base.rb: docs typo
|
2011-08-20 00:17:44 -05:00 |
|
dharmatech
|
31d38d37d3
|
ActionController::Redirecting : fix docs typo
|
2011-08-20 00:07:34 -05:00 |
|
Sebastian Martinez
|
0b3b91cdcd
|
Document debugging assets set by default for dev and test envs in the asset_pipeline guide.
|
2011-08-19 19:45:55 -03:00 |
|
Santiago Pastorino
|
8bd76aa50e
|
Merge pull request #2581 from guilleiguaran/debug-assets-in-dev
Debug assets by default in development and test environments
|
2011-08-19 15:28:52 -07:00 |
|
Xavier Noria
|
72bc89fac7
|
Merge pull request #2589 from vijaydev/guides
Mailer guide fixes
|
2011-08-19 13:09:50 -07:00 |
|
Vijay Dev
|
129ad7226d
|
mailer guide: fixes indentation, and use fixed width fonts wherever necessary
|
2011-08-20 00:17:37 +05:30 |
|