mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
26,158 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

26158 Commits

Author SHA1 Message Date
José Valim c778f4e84b Merge pull request #3593 from bogdan/callbacks 
AS::Callbacks._define_runner better abstraction
 2011-11-10 02:50:46 -08:00
José Valim d2cfa982fd Merge pull request #3581 from amatsuda/metal_response_body_19 
AC::Metal#response_body= stores different value in Ruby 1.8 and 1.9
 2011-11-10 00:49:14 -08:00
Bogdan Gusiev bf6e29e007 AS::Callbacks#_define_runner refactored 
Incapsulate the logic of keyed callback method definition and execution
in the separated method.
 2011-11-10 10:25:27 +02:00
Alexey Vakhov b5c3987294 Fix and simplify highlight regexp 2011-11-10 11:26:42 +04:00
Tyler Coville 49349089ad Fixed error with 'rails generate new plugin' where the .gitignore was not properly generated if --dummy-path was used and added test case 2011-11-09 23:22:26 -08:00
Alexey Vakhov 983a2dccaa Cosmetic fix in number_to_currency docs 2011-11-10 09:45:57 +04:00
Akira Matsuda be7ab83b64 A test case to ensure that AC::Metal#response_body= always wraps the given value in an Array in both Ruby 1.8 and 1.9 (refs #3581) 2011-11-10 10:54:56 +09:00
José Valim a625523e75 Don't marshal dump twice when using encryptor. 2011-11-09 20:21:52 -02:00
José Valim 71e84a3b51 Deprecated ActiveSupport::MessageEncryptor#encrypt and decrypt. 2011-11-09 20:04:42 -02:00
José Valim 4c59170bb3 Merge pull request #3589 from amatsuda/console_extend_command_bundle_fix 
Extend IRB right before starting IRB to remove dependency on IRB from Rails::Application
 2011-11-09 14:04:04 -08:00
Akira Matsuda a658fd2ffa Extend IRB right before starting IRB to remove dependency on IRB from Rails::Application 2011-11-10 06:59:55 +09:00
José Valim f686d9429f Use head :no_content on the guides as well. 2011-11-09 19:06:02 -02:00
José Valim 4857339aab Merge pull request #3509 from amatsuda/console_extend_command_bundle 
move Rails console top level methods to IRB context
 2011-11-09 02:14:50 -08:00
Akira Matsuda 6d09f275c6 Modulize Rails console methods so that other console libraries such as Pry can include these methods 2011-11-09 15:42:19 +09:00
Vijay Dev fba28ece7e Merge pull request #3579 from arunagw/missing_md_in_changelog 
CHANGELOG => CHANGELOG.md
 2011-11-08 22:26:31 -08:00
Arun Agrawal f642724f27 CHANGELOG => CHANGELOG.md 
I missed these in previous commit
 2011-11-09 11:54:07 +05:30
Vijay Dev 2843d3b277 Merge pull request #3574 from arunagw/refactor_testing_uncommitted_task 
Refactor test:uncommitted task.
 2011-11-08 22:15:29 -08:00
Arun Agrawal 5f826ea26f Refactor test:uncommitted task. 
Thanks to @sobrinho (Gabriel Sobrinho)
 2011-11-09 09:46:51 +05:30
Aaron Patterson 6e87281b5f Merge pull request #3572 from amatsuda/ar_exists_uniq_order 
exclude ORDER BY clause when querying Relation#exists?
 2011-11-08 12:39:50 -08:00
Akira Matsuda 74c6e80cab exclude ORDER BY clause when querying Relation#exists? 2011-11-09 04:51:11 +09:00
Vijay Dev 5b21bfa848 Merge pull request #3562 from rahul100885/rahul100885_work 
Updated Rakefile as CHANGELOG has been renamed to CHANGELOG.md
 2011-11-08 10:04:41 -08:00
Rahul Chaudhari 8e5686658e Updated Rakefile as CHANGELOG has been renamed to CHANGELOG.md 2011-11-08 23:20:38 +05:30
Vijay Dev cff1d751d0 Merge branch 'master' of github.com:lifo/docrails 
Conflicts:
	railties/guides/source/active_record_querying.textile
 2011-11-08 21:35:17 +05:30
Joost Baaij 1ffd5ec910 Replace example with SQL placeholder syntax. 
This works just fine, is less code, and reduces the risk of someone implementing a SQL injection vulnerability.
 2011-11-08 16:27:15 +01:00
Alexey Vakhov 979f3f894b Fix small typo in link_to_function doc 2011-11-08 18:01:19 +04:00
José Valim 34f61f8b1d Merge pull request #3568 from bfolkens/master-url_subdomain_with_numeric_host 
Fix trouble using :subdomain in development environment when using numeric addresses.
 2011-11-08 06:00:22 -08:00
Bradford Folkens bd559b0068 Fix trouble using :subdomain in development environment when using numeric addresses. 
See-also pull request #3561 from 3-1-stable

    Otherwise the following occurs:

    TypeError: can't convert nil into String
        /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:75:in host_or_subdomain_and_domain'
        /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:37:in url_for'
        /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/routing/url_for.rb:147:in test_subdomain_may_be_accepted_with_numeric_host'
        /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/testing/setup_and_teardown.rb:67:in run'
        /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:426:in send'
        /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:81:in run'
 2011-11-08 07:52:35 -06:00
José Valim 1347665d89 Merge pull request #3564 from arunagw/uncommitted_rake_fix 
Should be checking if file exists or not.
 2011-11-08 02:28:41 -08:00
Arun Agrawal fe67501e62 Should be checking if file exists or not. 
I found this bug when running rake test:uncommitted 
on a newly generated rails app which don't have
test file for application_controller.
Can see detail here #3461
 2011-11-08 15:51:47 +05:30
Xavier Noria 805e39b025 Merge pull request #3565 from arunagw/warning_remove_release_file 
Warnings removed.
 2011-11-08 01:24:58 -08:00
Arun Agrawal b3175f6cb9 Warnings removed. 2011-11-08 14:28:28 +05:30
Vijay Dev 588faedaf4 Merge pull request #3563 from arunagw/changelog_to_md 
CHANGELOG to CHANGELOG.md
 2011-11-07 23:54:28 -08:00
Arun Agrawal b53f77ec99 CHANGELOG to CHANGELOG.md 2011-11-08 12:56:51 +05:30
Vijay Dev f5ca190bd3 fix typo again (Thanks Phillip Oertel) 2011-11-08 10:37:06 +05:30
José Valim 396638c3fd Merge pull request #3552 from evtuhovich/master 
Doc patch, DrbStore no more exists in rails
 2011-11-07 07:09:06 -08:00
Ivan Evtukhovich cf0a96bc6a DrbStore removed from cache backends 2011-11-07 18:57:55 +04:00
Vijay Dev 6ac56ac93b fix incorrect code example 2011-11-07 17:58:03 +05:30
Aaron Patterson 6a29ea04ae Merge pull request #3549 from luckydev/rmethod 
remove_method tests and changes
 2011-11-07 03:02:26 -08:00
Anand aabd61af8e added remove_method core_ext tests 2011-11-07 16:22:52 +05:30
Anand 4cef581fcf replaced remove and define method calls to :redefine 2011-11-07 16:22:30 +05:30
Xavier Noria 17ecdd388c adds trailing +s to the output of EXPLAIN for MySQL 2011-11-07 02:01:56 -08:00
José Valim 1a8df8aa88 Merge pull request #3542 from amatsuda/controller_generator_remove_blank_line 
Remove redundant blank line at the bottom of generated controller code
 2011-11-07 01:56:03 -08:00
Akira Matsuda cc3e738d89 Fix AC::Metal#response_body= to store same value on Ruby 1.8 and 1.9 
This was because String#respond_to?(:each) differs in 1.8 and 1.9
 2011-11-07 16:24:54 +09:00
Xavier Noria b454601be4 revises EXPLAIN tests for SQLite3 
The output in Travis is a bit different. The SQLite
documentation (http://www.sqlite.org/eqp.html) warns
output may change dramatically between releases. I
do not want to mock the result set because I want a
real EXPLAIN to happen. I prefer a test that may fail
in future releases than a test that may give false
positives in future releases.
 2011-11-06 22:21:05 -08:00
Akira Matsuda 42cf5eba26 Remove redundant blank line at the bottom 2011-11-07 14:31:12 +09:00
Akira Matsuda aff9e68cb5 document fix: remove_column takes multiple column_names 2011-11-07 14:03:33 +09:00
Aaron Patterson bcdc2c00d3 Merge pull request #3541 from dvyjones/fix-datetime-warnings 
Removed argument throwing warnings when running tests
 2011-11-06 19:00:07 -08:00
Akira Matsuda 55b203dac1 self.up, self.down => up, down 2011-11-07 11:56:50 +09:00
Henrik Hodne 9a7d916ceb Removed argument throwing warnings when running tests. 
The last argument to DateTime.new/civil is the Julian day number for
when the calendar reform occured. DateTime ignores it if it's 0, and
sets it to the default of DateTime::ITALY instead, so we could just
leave it out. This also removes the warnings while running the
ActiveSupport tests (there still are some for the setup though).
 2011-11-06 17:35:02 +01:00
Vijay Dev 4db1bd37cb fix typo 2011-11-06 22:03:30 +05:30