Commit Graph

29171 Commits

Author SHA1 Message Date
José Valim
14b2cf6a0a Merge pull request #5532 from mhfs/migration_blank_line
Remove blank line from generated migration
2012-03-21 00:34:38 -07:00
José Valim
2884567e55 Merge pull request #5522 from travisjeffery/fix_migration_generator_adding_removing_index
Fix adding/removing field's index when generating migration
2012-03-21 00:25:02 -07:00
Travis Jeffery
b2a59388b2 Generate Migration Thats Adds Removed Index
When generating a migration that removes a field with an index, the down
will add both the field and its index.
2012-03-21 01:20:35 +00:00
schneems
0a555dd421 fix rails server support of RAILS_ENV variable
When launching rails server from the command line with a rails environment specified such as `rails server RAILS_ENV=production` an error would occur since rails will try to use `RAILS_ENV=production` as it's server. 

When launching rails with a specified server such as thin `rails server thin RAILS_ENV=production` no error will be thrown, but rails will not start up in the specified environment.

This fixes both of those cases
2012-03-20 20:58:50 -04:00
Marcelo Silveira
c63306b1a8 Remove blank line from generated migration 2012-03-20 21:44:45 -03:00
Juanjo Bazán
50fc5a2bb5 Fixed-width font fix for instance variable 2012-03-20 22:57:06 +01:00
David Heinemeier Hansson
b49a7ddce1 We dont need to merge in the parameters as thats all being reset by the rack headers (and its causing problems for Strong Parameters attempt of wrapping request.parameters because it will change in testing) 2012-03-20 22:23:18 +01:00
Aaron Patterson
bdf7624a59 probably should require the objects we monkey patch. 2012-03-20 10:38:43 -07:00
Mark D. Blackwell
4a1a018d62 [ci skip] Make guides more readable & consistent 2012-03-20 13:01:01 -04:00
Aaron Patterson
c317c5b25d search private and protected methods for convert_key 2012-03-20 09:58:42 -07:00
Aaron Patterson
440559f661 bigdecimal can be duped on Ruby 2.0 2012-03-20 09:51:22 -07:00
Vijay Dev
ae88ec4dda guides location has changed [ci skip] 2012-03-20 20:30:36 +05:30
Xavier Noria
5c1f389332 Merge pull request #5524 from kennyj/add_missing_require
Add missing require
2012-03-20 07:16:26 -07:00
kennyj
c5b3cbc7e8 Add missing require 2012-03-20 23:11:27 +09:00
Dave Burt
a4b1423f4e Correct description of ['migrated_at > ?', 1.week.ago] from "more than a week ago" to "more recently than a week ago." 2012-03-20 16:13:19 +11:00
Charles Brian Quinn
884cb24afb Merge branch 'master' of github.com:lifo/docrails 2012-03-19 21:01:22 -04:00
Charles Brian Quinn
c291195a6d Updates ActionMailer Base summary and fixes space in code example. 2012-03-19 20:59:31 -04:00
Rafael Mendonça França
a26dcb6271 Remove code duplication 2012-03-19 19:43:34 -03:00
Jesse Brown
b3d4799369 Adding comma to correct syntax in comment. 2012-03-19 15:34:26 -07:00
José Valim
ae977150e7 Merge pull request #5515 from rafaelfranca/remove-exclude
Remove exclude option from ActionDispatch::SSL and fix secure cookies
2012-03-19 12:40:41 -07:00
Rafael Mendonça França
6e04a78462 Fix secure cookies when there are more than one space before the secure
keyword
2012-03-19 16:31:57 -03:00
Rafael Mendonça França
139bf55b26 Remove exclude option from ActionDispatch::SSL 2012-03-19 16:31:52 -03:00
Andrew White
09d884cd2c Merge pull request #5503 from jeyb/leap_day_time_date_time_selector
Fixes issue #5222: DateTimeSelector builds invalid dates on leap days
2012-03-19 10:01:54 -07:00
Vijay Dev
9c748f3961 Merge branch 'master' of github.com:lifo/docrails 2012-03-19 18:28:10 +05:30
Sandeep
426840c33c -h also shows help options. 2012-03-19 17:53:27 +05:30
Xavier Noria
50b3113eb4 Merge pull request #5507 from sandeepravi/warning_fixes
changed all.map to pluck
2012-03-19 03:25:01 -07:00
José Valim
98dc67cf5a Merge pull request #5508 from FND/tagged_logger_shortcut
Provide access to logger instance within TaggedLogging blocks
2012-03-19 03:10:47 -07:00
FND
e0ee14ed23 Provide access to logger instance within TaggedLogging blocks
this improves encapsulation, simplifying occurrences like the following:

    Rails.logger.tagged("DEBUG") { Rails.logger.debug(msg) }

... by removing the need to rely on (i.e. repeat) outer variables:

    Rails.logger.tagged("DEBUG") { |logger| logger.debug(msg) }
2012-03-19 10:49:27 +01:00
Sandeep
70a19b7d42 changed all.map to pluck 2012-03-19 15:17:49 +05:30
Jey Balachandran
d2d2fc0834 Fixes issue #5222: DateTimeSelector builds invalid dates on leap day when discarding both day and month. 2012-03-18 20:44:46 -07:00
Mikel Lindsaar
24d244c1bc Increase minimum version of mail.
Second security vulnerability found in mail file delivery method
  patched in version 2.4.4.
2012-03-19 14:43:41 +11:00
Piotr Sarnacki
d3bbb23b2f Merge pull request #5492 from arunagw/build_fix_app_generator_test
Build fix for app_generator_test.rb
2012-03-18 04:58:41 -07:00
José Valim
d802a6c275 Merge pull request #3329 from armstrjare/autosave_collection_new_record_bug
Autosave association doesn't save all records on a new record for a collection association if there are records marked for destruction
2012-03-18 04:13:28 -07:00
José Valim
0c18fafcdf Merge pull request #5496 from atd/master
time_tag support for blocks
2012-03-18 04:10:15 -07:00
Antonio Tapiador del Dujo
05406442b8 time_tag support for blocks 2012-03-18 12:07:51 +01:00
Mark Thomson
d25d3fba3e respond_with description: changed 'response' to 'format' 2012-03-18 05:48:32 -05:00
Mark Thomson
9e98d2dae1 Revised comments for respond_with 2012-03-18 05:31:33 -05:00
Jared Armstrong
f1903d8db7 Fix bug with autosave collection association on new record with a marked for destroy record in autosave collection. 2012-03-18 20:20:01 +13:00
Arun Agrawal
62e0337db1 Build fix for app_generator_test.rb 2012-03-18 10:24:18 +05:30
Aaron Patterson
2b5cb1cd41 Merge pull request #5486 from kennyj/fix_5435
Fix GH #5435. db:structure:dump should be re-enable.
2012-03-17 21:50:37 -07:00
Mark Thomson
a188a1d247 Merge remote-tracking branch 'origin/master' 2012-03-17 22:40:11 -05:00
Mark Thomson
f2bc404ba8 Merge remote-tracking branch 'origin/master' 2012-03-17 22:29:46 -05:00
Mark Thomson
98b4ef7306 Revised description for responds_with 2012-03-17 22:29:17 -05:00
Ryan Bigg
ef0821bef6 [getting started] Explain what the create action is accomplishing after params are output
[ci skip]
2012-03-17 20:41:32 -06:00
Ryan Bigg
b30cc24c40 [getting started] [ci skip] Explain in better terms what we are doing with render and params[:post] inspection upon first use 2012-03-17 20:41:06 -06:00
Ryan Bigg
62d3693288 [getting started] [ci skip] Just want to get post params 2012-03-17 20:40:29 -06:00
Ryan Bigg
edad287e84 [getting started] Add images 2012-03-17 20:40:05 -06:00
Piotr Sarnacki
c513ae36e0 Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform only 2012-03-17 23:32:03 +01:00
José Valim
0061496d71 Merge pull request #5489 from rdavila/fix_typo_activerecord_test
Fix typo in ActiveRecord::Relation#blank? test
2012-03-17 10:27:21 -07:00
José Valim
adadd865a2 Merge pull request #5488 from rafaelfranca/ad-ssl
Remove Rack::SSL in favour of ActionDispatch::SSL
2012-03-17 10:25:26 -07:00