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

26505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
José Valim
e2e9eabc58 Remove dead broken code from AD::Request 2011-12-08 09:30:27 +01:00
José Valim
f84bf83b9b Merge pull request #3888 from kennyj/should_use_default_charset 
Assign config.encoding to AD::Response.default_charset at the initialization time.
 2011-12-08 00:18:09 -08:00
José Valim
0144f4f023 Merge pull request #3901 from mark-rushakoff/inflection-regex-fix 
Fix inflection regexes for mouse, mice
 2011-12-08 00:04:45 -08:00
Mark Rushakoff
6f253fb440 Fix inflection regexes for mouse, mice 2011-12-07 23:14:02 -08:00
Aaron Patterson
a505b13774 moving ignored regexp to the instance 2011-12-07 17:42:05 -08:00
Aaron Patterson
38a8f7f8ba speeding up ignored sql testing 2011-12-07 17:32:01 -08:00
Aaron Patterson
76c29a64b9 Use a hash to look up column definitions 2011-12-07 17:25:31 -08:00
Aaron Patterson
7e176a6d12 try to normalize the objects passed to column() 2011-12-07 16:18:39 -08:00
Aaron Patterson
483a3cf287 automatically add the column definition to the columns list if creating a new one 2011-12-07 16:01:53 -08:00
Aaron Patterson
1fc47a1a84 stop calling String#to_s so frequently 2011-12-07 15:35:27 -08:00
Aaron Patterson
8523784265 the required sqlite3 adapter responds to encoding, so stop checking. 2011-12-07 15:01:04 -08:00
José Valim
30f0d7bac8 Remove #:nodoc: from partial renderer. 2011-12-07 19:16:14 +01:00
José Valim
12be0a5985 Merge pull request #3895 from kennyj/should_use_freezed_constant 
Should use freezed string constant here.
 2011-12-07 10:15:07 -08:00
José Valim
6867212261 Merge pull request #3889 from kielkowicz/master 
Annotating haml and slim file
 2011-12-07 10:14:26 -08:00
kennyj
0a958d8468 Use freezed string constant. Some string literals is used repeatedly. 2011-12-08 02:19:15 +09:00
Kazimierz Kiełkowicz
c6e6ce437c Moves migrations tests from railties/test/application/rake_test.rb to railties/test/application/rake/migrations_test.rb 2011-12-07 17:34:29 +01:00
Kazimierz Kiełkowicz
c45f744bb0 Move rake notes test to railties/test/application/rake/notes_test.rb 2011-12-07 17:31:31 +01:00
Kazimierz Kiełkowicz
8188d265a1 Update source_annotation_extractor comment. 2011-12-07 17:30:03 +01:00
José Valim
0df2ef3ef4 Merge pull request #3884 from sikachu/master-fix_layout 
Allow layout fallback when using `layout` method
 2011-12-07 08:00:45 -08:00
Santiago Pastorino
4f107384f0 Merge pull request #3894 from kelyar/master 
reversible migration example
 2011-12-07 07:10:27 -08:00
Evgeniy Kelyarsky
dd647d938e reversible migration example had missing block parameter 2011-12-07 17:03:51 +02:00
Kazimierz Kiełkowicz
8f61df0bcd Add annotation to haml and slim template. 2011-12-07 13:17:50 +01:00
kennyj
199353c658 Assign config.encoding to AD::Response.default_charset at the initialization time. 2011-12-07 21:11:08 +09:00
José Valim
eb22901920 Merge pull request #3878 from kennyj/should_use_default_charset 
Use default charset when we read content type without charset.
 2011-12-07 04:07:51 -08:00
kennyj
a1986e7d55 Use default charset when we read content type without charset. 2011-12-07 12:35:44 +09:00
Prem Sichanugrist
18ceed201b Allow layout fallback when using layout method 
Rails will now use your default layout (such as "layouts/application") when you specify a layout with `:only` and `:except` condition, and those conditions fail.

For example, consider this snippet:

    class CarsController
      layout 'single_car', :only => :show
    end

Rails will use 'layouts/single_car' when a request comes in `:show` action, and use 'layouts/application' (or 'layouts/cars', if exists) when a request comes in for any other actions.
 2011-12-06 21:16:29 -05:00
Prem Sichanugrist
0460b3a469 Fix bug in assert_template when using only :layout option 
Currently if you're do this:

    assert_template :layout => "foo"

Regardless of what layout you were using, the test will always pass. This was broken since the introduction of :layout option in [d9375f3f].

We have a lot of test cases in actionpack/test/controller/layout_test.rb that use this feature. This will make sure that those test cases are not true negative.
 2011-12-06 21:15:27 -05:00
José Valim
885a599303 Just track "require" if we have something in the watching stack. 
A patch has been provided earlier and we have asked for feedback:

    https://gist.github.com/1437939

Except one case, all other cases showed improvements in boot time.
 2011-12-06 21:09:44 +01:00
Aaron Patterson
9dee540084 avoid deprecated methods 2011-12-06 10:07:47 -08:00
Vasiliy Ermolovich
0968ee3456 add prefix and suffix to renamed tables, closes #1510 2011-12-06 10:02:45 -08:00
Vijay Dev
7eb596cddd Merge branch 'master' of github.com:lifo/docrails 2011-12-06 23:05:43 +05:30
Vijay Dev
89647a305f Revert "Added link to ActiveResource::Base documentation" 
This reverts commit 03d4388786.

Conflicts:

	activeresource/README.rdoc

Reason: I don't think this is absolutely necessary given the
fact that such links won't work in both GitHub and Rails API
at the same time. See links in rails/README.rdoc and rails/Rakefile
for some hackery that needs to be done to get such links work in
both places.
 2011-12-06 22:58:23 +05:30
Vijay Dev
078b4b54a6 use textile syntax in links 2011-12-06 22:51:07 +05:30
Vijay Dev
d1bf7db55d rxml and rhtml are no longer searched for source code annotations 2011-12-06 22:50:37 +05:30
Vijay Dev
cec909d938 copy edits in layouts guide, change links to be relative 2011-12-06 22:49:22 +05:30
Santiago Pastorino
9be2353fac Sync AP CHANGELOG with 3-1-stable 2011-12-06 11:28:05 -02:00
Santiago Pastorino
e58d663f3e Merge pull request #3428 from adrianpike/asset_path_conflicts 
Issue #3427 - asset_path_conflicts
 2011-12-06 05:16:24 -08:00
José Valim
f0f0e59c10 Ensure length validator also works on 1.8.7. 2011-12-06 14:13:44 +01:00
sandeepravi
b5e333d5b0 Added link to ActiveResource::Base documentation 2011-12-06 18:09:42 +05:30
sandeepravi
03d4388786 Added link to ActiveResource::Base documentation 2011-12-06 18:03:41 +05:30
Thomas von Deyen
7e12aa7424 Added git --rebase option for pulling rails master 2011-12-06 13:26:57 +01:00
sandeepravi
bc994470c4 Added wiki link to REST 2011-12-06 17:50:16 +05:30
José Valim
d722eb3b04 Merge pull request #3876 from tvdeyen/string_as_url_for_expire_action 
Allow string as url for expire_action
 2011-12-06 04:11:59 -08:00
Thomas von Deyen
0da31a1839 Allowing string as url argument for expire_action 2011-12-06 13:05:15 +01:00
sandeepravi
8a67b632ae Added wiki link for REST 2011-12-06 17:22:48 +05:30
José Valim
81fec5dfc4 Merge pull request #3872 from marcandre/i18n_key 
ActiveModel::Name#i18n_key: Fix doc and add tests
 2011-12-06 00:41:43 -08:00
José Valim
1ee832b2d8 Merge pull request #3873 from iangreenleaf/no_default_tokenizer 
Don't tokenize string when counting characters
 2011-12-06 00:41:05 -08:00
Marc-Andre Lafortune
d834755dad ActiveModel::Name#i18n_key: Fix doc and add tests 2011-12-05 22:02:53 -05:00
Aaron Patterson
a2f7c1dc67 make method signatures match the superclass signature 2011-12-05 18:36:27 -08:00
Aaron Patterson
b942ae836e return value is never tested, so stop calling presence 2011-12-05 18:36:08 -08:00