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,032 Commits 34 Branches 105 Tags
d4119e144a67e19cdf5d742caaf7d7647ebcb633
Commit Graph

26032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jon Leighton
d4119e144a Merge pull request #3680 from rubys/master 
This fix causes the AWDwR test to go back to being green on Rails master.
 2011-11-18 07:21:57 -08:00
Sam Ruby
42954c426b Stop db:seed from performing a reload of the db 
Fix regression introduced by 38d26b0cb5
 2011-11-18 10:05:06 -05:00
Vijay Dev
1c4564b620 Merge pull request #3666 from oscardelben/databases_rake_cleanup 
Cleanup of databases.rake psql env variables
 2011-11-18 04:21:56 -08:00
Xavier Noria
307fc122f6 release instructions: new section about docs generation 2011-11-18 13:05:25 +01:00
Vijay Dev
96792d2756 Merge pull request #3669 from parndt/patch-1 
Fixed typo: expect -> expected
 2011-11-17 23:40:33 -08:00
lest
e8d57f361a _html translation should escape interpolated arguments 2011-11-17 23:07:39 +00:00
Xavier Noria
1079724fe6 Revert "warn the user values are directly interpolated into _html translation strings" 
Reason: After another round of discussion, it has been
decided to let interpolation deal with unsafe strings
as it should do.

This reverts commit d57d8098fc.
 2011-11-17 23:59:19 +01:00
Aaron Patterson
a437986f43 allow people to set a local .Gemfile so that things like ruby-debug are not required for regular development 2011-11-17 14:41:53 -08:00
Xavier Noria
d57d8098fc warn the user values are directly interpolated into _html translation strings 2011-11-17 23:07:06 +01:00
Philip Arndt
e375970725 Fixed typo: expect -> expected 2011-11-18 10:17:16 +13:00
Vijay Dev
9b534060bf update guide: db:structure:dump produces structure.sql now 2011-11-18 01:17:21 +05:30
Aaron Patterson
a2f14e2344 Revert "Merge pull request #1163 from amatsuda/sexier_migration_31" 
This reverts commit 0e407a9041, reversing
changes made to 533a9f84b0.

Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
	activerecord/test/cases/migration_test.rb
 2011-11-17 10:29:28 -08:00
Aaron Patterson
649f2513a4 Revert "Merge pull request #3603 from vijaydev/change_table_without_block_arg" 
This reverts commit 81fad6a270, reversing
changes made to 23101de283.

Conflicts:

	activerecord/test/cases/migration_test.rb
 2011-11-17 10:29:28 -08:00
Oscar Del Ben
a89fabbb02 Cleanup of databases.rake psql env variables 2011-11-17 18:49:47 +01:00
José Valim
d8b2b6a183 Merge pull request #3663 from atambo/master 
Move schema_format :sql config setting from test.rb to application.rb
 2011-11-17 07:10:11 -08:00
Alex Tambellini
0af93089de Move schema_format :sql config setting from test.rb to application.rb 
I've moved the schema_format :sql config setting to application.rb because you would
never enable this only for the test environment. If you use database constraints
or database specific data types you would want all of your environments to use them.
 2011-11-17 09:44:17 -05:00
José Valim
e2d3060a68 Merge pull request #3654 from wildchild/label_i18n 
Fix impractical I18n lookup in nested fields_for
 2011-11-17 00:02:49 -08:00
Vijay Dev
e6f3299158 Merge pull request #3658 from arunagw/fix_initialize_var_name 
It should be @calculated_ip not @calculate_ip
 2011-11-16 23:30:45 -08:00
Arun Agrawal
c3ae1d2aec It should be @calculated_ip not @calculate_ip 
We are using @calculated_ip. 
@calculate_ip is no where used
 2011-11-17 12:50:19 +05:30
Vijay Dev
4148a7ca7d Merge pull request #3656 from arunagw/readline_to_read 
No need to `readlines` then `join`, just use `read` ❤️
 2011-11-16 23:00:40 -08:00
Arun Agrawal
5ccd9bcc1a No need to readlines then join, just use read ❤️ 
same as 4c1a1933cb
 2011-11-17 12:24:40 +05:30
Alexander Uvarov
c2b6f63bbe Fix impractical I18n lookup in nested fields_for 2011-11-17 12:37:00 +06:00
Aaron Patterson
e367142255 Initialize our instance variables. 2011-11-16 16:55:11 -08:00
Aaron Patterson
70f9b74a49 Merge pull request #3649 from indirect/remote_ip 
Fixes for Request#remote_ip (no middleware, all proxies)
 2011-11-16 16:44:09 -08:00
Aaron Patterson
4c1a1933cb No need to readlines then join, just use read ❤️ 2011-11-16 16:18:00 -08:00
Aaron Patterson
bb95e81538 Adding a deprecation warning for use of the schema_info table. 2011-11-16 15:51:25 -08:00
Aaron Patterson
97ca6358c5 Join method uses empty string by default, so remove it 2011-11-16 15:40:20 -08:00
Aaron Patterson
b96aaf8ccb dbfile isn't supported anymore, so remove 2011-11-16 15:31:37 -08:00
Aaron Patterson
ca69408b49 Reduce schema format tests 2011-11-16 15:31:37 -08:00
Aaron Patterson
38d26b0cb5 Move conditionals to separate tasks so they can be reused. 2011-11-16 15:31:37 -08:00
Jon Leighton
272f2b778f Merge pull request #3500 from olivierlacan/error-whitespace 
CSS fix to prevent error output from being breaking out of body element.
 2011-11-16 15:26:31 -08:00
Jon Leighton
540e929d75 Merge pull request #3438 from lazyatom/becomes-includes-errors 
Becomes includes errors
 2011-11-16 15:23:44 -08:00
James Adam
73cb0f9828 ActiveRecord::Base#becomes should retain the errors of the original object. 
This commit contains a simple failing test that demonstrates the behaviour we expect, and a fix. When using `becomes` to transform the type of an object, it should retain any error information that was present on the original instance.
 2011-11-16 23:19:58 +00:00
Andre Arko
a9044d0117 the object itself isn't the IP, #to_s is the IP 2011-11-16 13:13:22 -10:00
Jon Leighton
a152fd34d3 Merge pull request #3608 from arunagw/unused_var_remove 
Unused variable removed
 2011-11-16 14:57:48 -08:00
Andre Arko
5621abd569 🤦 Request#remote_ip has to work without the middleware 2011-11-16 12:54:18 -10:00
Andre Arko
f05ccf805a Revert "Revert "Merge pull request #3640 from indirect/remote_ip"" 
This reverts commit 8d1a2b3ecd, because I have fixed the issues this commit caused in the next commit.
 2011-11-16 12:53:43 -10:00
Aaron Patterson
cef1e14e09 removing some useless conditionals 2011-11-16 14:46:20 -08:00
Aaron Patterson
43821bf351 Merge pull request #2948 from atambo/master 
schema_format :sql should behave like schema_format :ruby
 2011-11-16 14:37:24 -08:00
Jon Leighton
3a6a10a36d Switch from marshal format to plain text for the encoding conversions dump. This is for windows compatibility. Fixes #3644. 2011-11-16 21:38:06 +00:00
Aaron Patterson
61228e9a0c fixing tests on PG 2011-11-16 13:25:55 -08:00
Aaron Patterson
df5ec41b89 bundler treats trunk ruby as ruby 1.9, hack around that for now 2011-11-16 10:42:56 -08:00
Daniel Dyba
325abe9fba Substituted RailsCommands for Rails::Commands 2011-11-16 10:26:28 -08:00
Daniel Dyba
21c5a0a104 Changed Commands module to RailsCommands. 
This is to avoid a conflict that occurs when you add Rake to
your Gemfile. There is a Commands Object in Rake that conflicts
with the Commands module in plugin.rb. See rails issue #1866.
 2011-11-16 10:23:00 -08:00
Aaron Patterson
936404399d Merge pull request #3634 from RyanNaughton/fixes_3483 
Fixes 3483
 2011-11-16 09:26:02 -08:00
Jon Leighton
8d1a2b3ecd Revert "Merge pull request #3640 from indirect/remote_ip" 
This reverts commit 6491aadc52, reversing
changes made to 83bf0b626c.

See https://github.com/rails/rails/pull/3640#issuecomment-2752761 for
explanation.
 2011-11-15 22:47:18 +00:00
Yehuda Katz
6491aadc52 Merge pull request #3640 from indirect/remote_ip 
GetIp#to_s should never return nil. That's icky.
 2011-11-15 13:59:31 -08:00
Vijay Dev
83bf0b626c refactor test_multiple_of 2011-11-16 02:36:36 +05:30
Arun Agrawal
76b6027cd8 Unused variable removed 2011-11-15 13:23:27 +05:30
Ryan Naughton
63a22ca616 Fixes issue #3483, regarding using a mixture of ranges and discrete values in find conditions. Paired with Joey Schoblaska. 2011-11-14 21:43:27 -06:00