Jeremy Kemper
|
e5d0bb22ef
|
Fix version number in CHANGELOG
|
2011-10-11 21:03:08 -07:00 |
|
Jeremy Kemper
|
b8bb5f44c8
|
Treat 303 See Other as a redirect response, too
|
2011-10-11 21:01:11 -07:00 |
|
Jeremy Kemper
|
027ecd3afb
|
Merge remote-tracking branch 'jimherz/activeresource_redirection_patch'
Closes #3302
|
2011-10-11 20:54:06 -07:00 |
|
Jim Herzberg
|
a78a75d67a
|
activeresource should treat HTTP status 307 as redirection, same as 301 and 302; added missing test cases for statii 301 and 302.
|
2011-10-11 17:46:24 -07:00 |
|
José Valim
|
fa79408a55
|
Merge pull request #3295 from zhengjia/master
Fix multiple includes with options
|
2011-10-11 09:50:53 -07:00 |
|
zhengjia
|
1adf5662b5
|
Fixed serialization issues with multiple includes with options
|
2011-10-11 11:09:43 -05:00 |
|
José Valim
|
7b84e36cd6
|
Merge pull request #3289 from avakhov/p-respond_to-conditions
Support symbol and string actions in AC#respond_to options
|
2011-10-11 02:06:22 -07:00 |
|
Alexey Vakhov
|
50d262f52a
|
Support symbol and string actions in AC#respond_to options
|
2011-10-11 12:48:03 +04:00 |
|
José Valim
|
1735868c61
|
Merge pull request #3285 from dcrec1/master
Fixes #3280: Shorthand route nested in scope produces missing controller error
|
2011-10-10 23:57:03 -07:00 |
|
Vijay Dev
|
b5f66cf7eb
|
Merge pull request #3286 from rahul100885/rahul100885_workspace
Corrected typo
|
2011-10-10 23:28:53 -07:00 |
|
RAHUL CHAUDHARI
|
16a0013d96
|
Corrected typo
|
2011-10-11 10:26:22 +05:30 |
|
Diego Carrion
|
8f863742e3
|
allow shorthand routes with nested optional parameters
|
2011-10-10 19:53:42 -03:00 |
|
Vijay Dev
|
fcb70f364c
|
Merge branch 'master' of github.com:lifo/docrails
|
2011-10-10 19:41:25 +05:30 |
|
Vijay Dev
|
e9413b5de3
|
Merge pull request #3274 from arunagw/warning_removed_mysql2
ambiguous first argument; put parentheses or even spaces Warning removed!
|
2011-10-10 04:39:18 -07:00 |
|
Vijay Dev
|
b27ca99b7b
|
Merge pull request #3265 from arunagw/warning_uri_parser
URI.escape is obsolete : warning removed
|
2011-10-10 04:34:22 -07:00 |
|
José Valim
|
c3c157141c
|
Merge pull request #3275 from simi/patch-1
Improve ActiveRecord changelog
|
2011-10-10 03:45:27 -07:00 |
|
Ryan Bigg
|
9c9583fa9b
|
[engines guide] add TODO for RedCarpet example
|
2011-10-10 21:04:27 +11:00 |
|
Ryan Bigg
|
59c9825be5
|
[engines guide] cover generating the comment resource
|
2011-10-10 21:04:27 +11:00 |
|
Ryan Bigg
|
44fc397c80
|
Fix rails/generators/base.rb documentation for generator lookup
|
2011-10-10 21:04:26 +11:00 |
|
Ryan Bigg
|
be01aa6c9b
|
[engines guide] amend two TODOs for further things in this guide
|
2011-10-10 21:04:26 +11:00 |
|
Ryan Bigg
|
9e6d43f9c9
|
[engines guide] finish covering what the scaffold generator does within an engine
|
2011-10-10 21:04:26 +11:00 |
|
Ryan Bigg
|
da030cf9cb
|
[engines guide] final line change
|
2011-10-10 21:04:26 +11:00 |
|
Ryan Bigg
|
765d3e955f
|
[engines guide] Add TODO for mentioning rails s and rails c
|
2011-10-10 21:04:26 +11:00 |
|
Ryan Bigg
|
b02bd74c13
|
[engines guide] begin explaining what the scaffold generator outputs within an engine
|
2011-10-10 21:04:25 +11:00 |
|
Ryan Bigg
|
685c24d730
|
[engines guide] reword first two dot points in prologue
|
2011-10-10 21:04:25 +11:00 |
|
Ryan Bigg
|
c580812a55
|
[engines guide] Credit where credit is due + explaning directory structure
|
2011-10-10 21:04:25 +11:00 |
|
Ryan Bigg
|
454492dfd7
|
[engines guide] Credit where credit is due
|
2011-10-10 21:04:25 +11:00 |
|
Josef Šimánek
|
ceb65a639c
|
Active Record changelog mistakes
|
2011-10-10 12:19:31 +03:00 |
|
Arun Agrawal
|
af7eeaafdb
|
ambiguous first argument; put parentheses or even spaces Warning removed!
|
2011-10-10 14:16:45 +05:30 |
|
José Valim
|
84c8b2feee
|
Merge pull request #3272 from odorcicd/fix_json_error_root
JSON responder should return errors with :errors root
|
2011-10-10 00:06:56 -07:00 |
|
Denis Odorcic
|
a0a68ecbb2
|
JSON responder should return errors with :error root
|
2011-10-10 01:42:12 -04:00 |
|
Jon Leighton
|
3456ef1119
|
Use broken YAML that will fail with Syck as well as Psych. Fixes test_broken_yaml_exception in fixtures_test.rb on Ruby 1.8.7.
Cherry-pick from 3-1-stable: b8d46924e7
|
2011-10-09 16:47:53 -07:00 |
|
mhutchin
|
11b183eb92
|
Copy editing to improve readability, consistency, and tone
|
2011-10-09 16:07:30 -07:00 |
|
mhutchin
|
5f632a88a6
|
Minor copy editing
|
2011-10-09 15:56:01 -07:00 |
|
Jeremy Kemper
|
8dba127188
|
Remove stray whitespace
|
2011-10-09 14:21:12 -07:00 |
|
Joseph Palermo
|
c90e5ce779
|
Only use LOWER for mysql case insensitive uniqueness check when column has a case sensitive collation.
|
2011-10-09 13:14:07 -07:00 |
|
Santiago Pastorino
|
8f8fd4f3aa
|
Merge pull request #3270 from kennyj/fix_invalid_regex
(small patch) fix invalid regex in testcase
|
2011-10-09 10:42:21 -07:00 |
|
Guillermo Iguaran
|
c2f03d19c2
|
Merge pull request #70 from mcdd/master
Update security guide ActiveRecordStore/SessionStore
|
2011-10-09 10:01:09 -07:00 |
|
kennyj
|
6d05597d0f
|
fix invalid regex
|
2011-10-10 01:54:54 +09:00 |
|
mhutchin
|
74b9441c0d
|
Copy editing: s/Rails guesses/Rails assumes/g
|
2011-10-09 09:36:19 -07:00 |
|
Dan McDonald
|
b9b4cfcebc
|
ActiveRecordStore is now called SessionStore.
|
2011-10-09 09:31:11 -06:00 |
|
Vijay Dev
|
a2edc884f3
|
Merge branch 'master' of github.com:lifo/docrails
|
2011-10-09 20:10:53 +05:30 |
|
Santiago Pastorino
|
1774ec7464
|
Merge pull request #3266 from arunagw/warnings_removed
Warnings removed when running with 1.9.3
|
2011-10-09 07:34:56 -07:00 |
|
Vijay Dev
|
3a72c01be2
|
Corrections to the ajax guide recent changes. This guide is very
outdated and will need a lot of changes to make it useful for Rails 3+
|
2011-10-09 19:58:14 +05:30 |
|
Arun Agrawal
|
ca219a21b6
|
Warnings removed when running with 1.9.3
|
2011-10-09 17:15:55 +05:30 |
|
Roy Tomeij
|
d214e54e7a
|
Fix a typo that was mysteriously entered in previous commit
|
2011-10-09 13:45:54 +02:00 |
|
Roy Tomeij
|
da773a24be
|
Add note about how Sass & Sprockets don't match
|
2011-10-09 13:38:47 +02:00 |
|
Arun Agrawal
|
2886513aea
|
URI.escape is obsolete : warning removed
|
2011-10-09 15:38:14 +05:30 |
|
José Valim
|
2ed66feae0
|
Merge pull request #3262 from subdigital/master
Add optional host option to force_ssl
|
2011-10-09 02:52:42 -07:00 |
|
José Valim
|
501e5b0d7f
|
Merge pull request #3196 from avakhov/patch-am-av-tests-2
Improve tests method for ActionView::TestCase and ActionMailer::TestCase
|
2011-10-09 02:15:19 -07:00 |
|