Commit Graph

25098 Commits

Author SHA1 Message Date
Jon Leighton
8397a564cb Merge pull request #2678 from jmileham/ares_content_length_bug
ActiveResource shouldn't rely on the presence of Content-Length
2011-09-12 10:11:39 -07:00
José Valim
11fa70dd09 Just provide the executable for railtie. This should be fine since Rubygems now warns before overriding them. 2011-09-12 09:05:11 -07:00
Xavier Noria
63082af306 Merge pull request #2984 from jrgifford/master
Added getting_started application to railties/guides/code/getting_started
2011-09-12 07:49:36 -07:00
James Gifford
d7154d4832 Added getting_started code, updated guide with link to rails github repo and path to code 2011-09-12 10:30:45 -04:00
Santiago Pastorino
4bcacc8066 Merge pull request #2936 from joelmoss/migration_status
db:migrate:status not looking at all migration paths
2011-09-11 17:06:21 -07:00
John Mileham
a06d17480f ActiveResource shouldn't rely on the presence of Content-Length 2011-09-11 14:46:50 -04:00
Vijay Dev
95fdaf965a Merge branch 'master' of github.com:lifo/docrails 2011-09-11 17:41:39 +05:30
Emin Hasanov
715b0996ca Merge pull request #66 from hasanove/master
typo in asset pipeline guide
2011-09-11 03:36:24 -07:00
Emin Hasanov
22a4f7e8bd Fix typo in "must-revalidate" header name 2011-09-11 14:18:07 +06:00
Andy Lindeman
28e32598b9 Fix for :instance_reader => false code example 2011-09-10 21:49:13 -04:00
Santiago Pastorino
a9509284ca Merge pull request #2974 from md5/csrf_token_warning
Use ensure instead of rescue
2011-09-10 17:29:04 -07:00
Ray Baxter
41d179b7d6 Revert "Fixed syntax error in "block setting of attributes" example."
Code and CHANGELOGS can't be edited in docrails.
You'll need to make this change in rails/rails.

This reverts commit 465752ba6b.
2011-09-10 13:50:33 -07:00
Erik Ostrom
465752ba6b Fixed syntax error in "block setting of attributes" example. 2011-09-10 13:39:25 -05:00
Mike Dillon
dbef311819 Use ensure instead of rescue 2011-09-10 11:01:22 -07:00
Aaron Patterson
d0946fdd57 Merge pull request #2972 from md5/master
Use log.warn instead of debug for CSRF token warning
2011-09-10 10:45:47 -07:00
Xavier Noria
e8e1911738 clarify that documentation bugs have to be reported as Rails issues. [Closes #2858] 2011-09-10 19:29:50 +02:00
Mike Dillon
e7e6515146 Fix changelog entry 2011-09-10 09:54:57 -07:00
Mike Dillon
538fb18dea Add test for warning and CHANGELOG entry 2011-09-10 09:51:55 -07:00
Santiago Pastorino
0a6756802c Merge pull request #2970 from deepakprasanna/master
Added a case to check the status of the migration after a rollback and redo.
2011-09-10 09:20:02 -07:00
Vijay Dev
365aaeac35 Merge pull request #2968 from arunagw/form_helper_test
No need to use </form> here. It's already in whole_form block
2011-09-10 09:00:19 -07:00
Mike Dillon
7fb99e5743 Change log level for CSRF token verification warning 2011-09-10 08:31:04 -07:00
Michael P Laing
8a0876478d Update to conform to rails 3.1 generated caode 2011-09-10 16:38:50 +02:00
Deepak Prasanna
ab5f487184 added test for db migrate:redo 2011-09-10 12:55:37 +05:30
Arun Agrawal
abbd27fad8 No need to use </form> here. It's already in whole_form block 2011-09-10 12:22:29 +05:30
Santiago Pastorino
4d3a73e5dd Merge pull request #2957 from waseem/migration_status_tests
Tests for rake db:migrate:status.
2011-09-09 21:58:37 -07:00
Santiago Pastorino
be24be62b6 Merge pull request #2876 from alex3/patch-1
Fixed assets precompile regex
2011-09-09 21:56:28 -07:00
Santiago Pastorino
f43ffdcb96 Merge pull request #2966 from arunagw/no_use_warnings_removed
Not used variables removed. Warnings removed.
2011-09-09 21:50:10 -07:00
Arun Agrawal
fb73be8469 Not used variables removed. Warnings removed. 2011-09-10 09:38:57 +05:30
Aaron Patterson
0f04260c51 railties depends on actionpack, so put actionpack in the include path 2011-09-09 19:00:33 -07:00
Aaron Patterson
9736cb2bab rake already ships with a ruby command 2011-09-09 18:56:11 -07:00
Aaron Patterson
7bc6a0098b move route inspecting to an object so that we can more easily test it 2011-09-09 18:50:32 -07:00
John Mileham
f776661fd2 Failing test: ActiveResource shouldn't rely on the presence of Content-Length 2011-09-09 19:05:26 -04:00
Aaron Patterson
06e400eef2 Merge pull request #2960 from guilleiguaran/fix-isolated-ar-tests
Add missing require in base_test.rb, fixes isolated test
2011-09-09 10:49:05 -07:00
Guillermo Iguaran
b7f1735fea Add missing require in base_test.rb, fixes isolated test 2011-09-09 12:46:06 -05:00
Waseem Ahmad
bc7eddea20 Tests for rake db:migrate:status. 2011-09-09 15:39:53 +05:30
José Valim
b325a77410 Merge pull request #2956 from lawrencepit/full_messages
Ability to get single full error message
2011-09-09 01:49:17 -07:00
Lawrence Pit
8817796167 Added test for obj.errors.as_json 2011-09-09 18:34:13 +10:00
Lawrence Pit
f5a944f662 Add ability to get an individual full error message + test for full_messages. 2011-09-09 18:28:25 +10:00
Jeff Dutil
37f1cf0a8b Travis-ci build image should link to the rails travis ci build page rather than to the image. 2011-09-08 22:53:38 -04:00
Aaron Patterson
ac1a363c6e Pull up a method we only use once. 2011-09-08 16:04:57 -07:00
Aaron Patterson
41a085ebc9 Conditions must never be equal 2011-09-08 16:04:57 -07:00
Jon Leighton
cbf1dc7842 Merge pull request #2757 from andmej/first_or_create_pull_request
Add first_or_create family of methods to Active Record
2011-09-08 15:07:23 -07:00
Jon Leighton
04baa4b2ca Remove failing test which was wrongly introduced.
This test was introduced in pull request #2577. The author of the pull
request included the test, which was originally in #2230, at the same
time as fixing a separate (but related) bug. However, the author did not
include a fix for this test, so when #2577 was merged, a failing test
was introduced.

So I am removing the failing test for now. If anyone wants to fix the
bug, please do so and submit a complete pull request with a test and
a fix.
2011-09-08 22:28:43 +01:00
Alex Yakoubian
901c02d86a Fixed assets precompile regex, now accepts Procs 2011-09-08 13:44:08 -07:00
Vijay Dev
e05d4cea69 revert the changes from c60995f3 - related to marking sub,gsub as unavailable to use with safe strings 2011-09-09 01:05:07 +05:30
Xavier Noria
9987f1e34d delete the CHANGELOG entry re SafeBuffer and sub/gsub, since it has been reverted 2011-09-08 21:28:17 +02:00
José Valim
6b010c2690 Revert removing gsub and sub from safe buffer. 2011-09-08 20:54:30 +02:00
Vijay Dev
59198ecb65 some copy-edits 2011-09-08 18:25:43 +05:30
Vijay Dev
0d25491581 Merge branch 'master' of github.com:lifo/docrails 2011-09-08 18:06:43 +05:30
Xavier Noria
d1d51077d5 mention the issue number for future reference 2011-09-08 05:22:02 -07:00