TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
31,022 Commits 2 Branches 0 Tags 294 MiB
40d5303b4f
Commit Graph

31022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vijay Dev
40d5303b4f Merge branch 'master' of github.com:lifo/docrails 2012-06-02 21:50:02 +05:30
Vijay Dev
ab2bf8148c copy edit AS guide [ci skip] 2012-06-02 21:46:39 +05:30
Vijay Dev
313c528e0b copy edit routing guide [ci skip] 2012-06-02 21:46:28 +05:30
Vijay Dev
983687a9e5 fix up the example app for getting started guide [ci skip] 2012-06-02 21:38:32 +05:30
Hrvoje Šimić
faf550c191 better explanations for acts_like?, try and deep_dup 2012-06-02 15:04:35 +02:00
Rafael Mendonça França
a769fe9db1 Revert some ActiveSupport::Callbacks changes. 
This reverts commits 911a0859ac065aa8e8834ac985353d659c7c7b65 and
30b31f51af6f7094c4a27b086755fc66c368d6fa.

Reason: these changes make the Active Model tests fail randomly.

Some examples:
http://travis-ci.org/#!/rails/rails/jobs/1498992
http://travis-ci.org/#!/rails/rails/jobs/1496948
http://travis-ci.org/#!/rails/rails/jobs/1489985

This script was used to reproduce these breaks:
https://gist.github.com/f6828a03ee4d40bffbc3

200 times, 0 failures
 2012-06-01 15:14:06 -03:00
Piotr Sarnacki
60b4290f1b Allow to use mounted helpers in ActionView::TestCase 
Similarly to 6525002, this allows to use routes helpers for mounted
helpers, but this time in ActionView::TestCase
 2012-06-01 17:45:06 +02:00
Xavier Noria
afcc7cc301 minor comment revision 2012-06-01 16:57:58 +02:00
José Valim
5c565a2942 Merge pull request #6588 from nbibler/polymorphic_to_model 
Correct the use of to_model in polymorphic routing
 2012-06-01 16:42:09 +02:00
Rafael Mendonça França
3449b757da Sync CHANGLOG with the 3-2-stable branch 2012-06-01 11:41:30 -03:00
Piotr Sarnacki
6525002297 Include routes.mounted_helpers into integration tests 
In integration tests, you might want to use helpers from engines that
you mounted in your application. It's not hard to add it by yourself,
but it's unneeded boilerplate. mounted_helpers are now included by
default. That means that given engine mounted like:

    mount Foo::Engine => "/foo", :as => "foo"

you will be able to use paths from this engine in tests this way:

    foo.root_path #=> "/foo"

(closes #6573)
 2012-06-01 16:14:08 +02:00
Rafael Mendonça França
7013f73c3b Merge pull request #6586 from amatsuda/generator_blank_line 
remove unneeded blank line from !namespeced? generated controllers
 2012-06-01 06:57:25 -07:00
Akira Matsuda
ec106e9d43 remove unneeded blank line from !namespeced? controller generators 2012-06-01 22:51:15 +09:00
Piotr Sarnacki
070454c6f7 Merge pull request #6583 from amatsuda/rake_dsl_19 
Revert "Only include Rake::DSL if it's defined."
 2012-06-01 02:28:21 -07:00
Xavier Noria
ec9636e9da Merge pull request #6584 from amatsuda/ar_explain_inspect_readability 
improve readability of AR explain result
 2012-06-01 02:21:21 -07:00
Akira Matsuda
c1ea574b27 improve readability of AR explain result 2012-06-01 17:05:52 +09:00
José Valim
47896d22d3 Merge pull request #6579 from amatsuda/null_relation_modulize 
modulize AR::NullRelation
 2012-05-31 23:58:48 -07:00
spyhole
cd31eb19dd change welcome_helper.rb to home_helper.rb 2012-06-01 02:56:42 -04:00
spyhole
f820668867 Update guides/code/getting_started/test/functional/home_controller_test.rb 2012-06-02 13:33:39 +08:00
spyhole
890c4b7778 the file name should be changed to home_helper.rb 2012-06-02 13:20:17 +08:00
spyhole
81281befb2 Update guides/code/getting_started/app/controllers/home_controller.rb 2012-06-02 12:17:48 +08:00
spyhole
b4f1c16908 Update guides/code/getting_started/config/routes.rb 2012-06-02 12:17:13 +08:00
schneems
e63666398d routes are viewable in browser (update guides) 
From the Pull Request #6461
 2012-06-01 16:46:11 +02:00
Akira Matsuda
76531cbe88 Revert "Only include Rake::DSL if it's defined." 
This reverts commit 82c3aca17e78d25f217702e530586673f2a219d7.

Reason: Ruby 1.9.3 is shipped with Rake > 0.9
 2012-06-01 15:17:18 +09:00
Akira Matsuda
c8882c1a40 unused method arguments 2012-06-01 14:46:21 +09:00
Akira Matsuda
212a74d8b7 modulize AR::NullRelation 
now we can invoke previously added scope extension methods
 2012-06-01 14:46:13 +09:00
Jeremy Kemper
c1a0c7782e Rake::DSL should always be available 2012-05-31 11:56:21 -07:00
Aaron Patterson
5f91ea3dc1 Merge branch 'master-sec' 
* master-sec:
  Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
  predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
 2012-05-31 11:25:19 -07:00
Jeremy Kemper
51af1e2578 Explicitly require rake so its DSL is available 2012-05-31 11:21:45 -07:00
Jeremy Kemper
709e432d1b Rake is in 1.9 stdlib, no need for gem dep 2012-05-31 10:01:59 -07:00
Jeremy Kemper
5f690b97ba Psych is always available on 1.9 2012-05-31 10:01:59 -07:00
Rafael Mendonça França
da048de773 Merge pull request #6571 from jeremyf/extract-force-ssl-filter-logic-to-separate-method 
Extracted redirect logic from ActionController::Force::ClassMethods.forc...
 2012-05-31 09:43:55 -07:00
Jeremy Friesen
4791822368 Extracted redirect logic from ActionController::Force::ClassMethods.force_ssl 
Prior to this patch the existing .force_ssl method handles both defining
the filter and handling the logic for performing the redirect.

With this patch the logic for redirecting to the HTTPS protocol is
separated from the filter logic that determines if a redirect should
occur.  By separating the two levels of behavior, an instance method
for ActionController (i.e. #force_ssl_redirect) is exposed and available
for more granular SSL enforcement.

Cleaned up indentation.
 2012-05-31 12:39:28 -04:00
Andrew White
67b94799c2 Reduce warning messages when running Active Support tests 
Eliminate the warnings generated by redefining methods and constants.
 2012-05-31 17:18:25 +01:00
Rafael Mendonça França
5752b313ec Merge pull request #6566 from arunagw/add-javascripts-to-rake-stats-task 
Add code statistics for Javascript and CoffeeScript files
 2012-05-31 07:19:09 -07:00
Carlos Antonio da Silva
c51fb02406 Fix changelog example for count method with block [ci skip] 
Missed that too, thanks again @splattael.
 2012-05-31 10:10:12 -03:00
Carlos Antonio da Silva
959a36084a Fix wrong example for count method with block [ci skip] 
Thanks @splattael.
 2012-05-31 10:07:43 -03:00
Carlos Antonio da Silva
e2f5f01675 Simplify link_to using content_tag 
Add some tests for link_to with blocks and escaping content.
 2012-05-31 09:44:10 -03:00
Carlos Antonio da Silva
b6eb22cb64 Make link_to arguments explicit 2012-05-31 09:38:24 -03:00
Carlos Antonio da Silva
6471e09217 Make button_to arguments explicit and refactor a bit 
Prefer Hash#[]= over Hash#merge when setting a value.
 2012-05-31 09:38:24 -03:00
Carlos Antonio da Silva
a76b0cf8e5 Simplify logic to initialize valid conditions in RouteSet 
Remove :to_sym call from public_instance_methods iteration, as such
methods in Ruby 1.9 already return symbols. Initialize valid conditions
with controller/action instead of setting them afterwards.
 2012-05-31 09:38:24 -03:00
Arun Agrawal
a48b3f1a68 Add code statistics for Javascript and 
CoffeeScript files to `rake stats` task

Orignal PR was #2270

Thanks to @nfm
 2012-05-31 16:18:29 +05:30
Francesco Rodriguez
f87820d00a update ActiveModel::Dirty documentation 2012-05-31 05:06:00 -05:00
Jeremy Kemper
08477a6516 Work around undiagnosed bug that's draining a relation's bind_values 2012-05-31 00:47:50 -07:00
Jeremy Kemper
d5354af114 Fix backward compatibility with stored Hash values. Wrap coders to convert serialized values to indifferent access. 2012-05-30 23:21:57 -07:00
Rafael Mendonça França
9a30d82d45 Set RACK_ENV to nil in the dbconsole test 
This will fix the travis-ci build
 2012-05-30 23:29:47 -03:00
Rafael Mendonça França
3015649783 Fix app_generator_test with the changes introduced at 
f4d7af67ffc90f2542afa50c7579fc83ea4f45f2
 2012-05-30 22:46:53 -03:00
Rafael Mendonça França
ac7b1620e0 Merge pull request #6560 from martinoconnor/generator_fix 
Changed symbol platform to platforms for the commented out call to gem 'therubyracer'.
 2012-05-30 18:34:39 -07:00
Martin O'Connor
f4d7af67ff Changed symbol platform to platforms for the commented out call to gem 'therubyracer'. 
Dependency.rb expects the symbol to be named :platforms as opposed to platform. RubyMine's inspections indicate that the symbol should be named :platforms.
 2012-05-30 21:25:00 -04:00
Aaron Patterson
060c91cd59 Strip [nil] from parameters hash. 
Thanks to Ben Murphy for reporting this!

CVE-2012-2660
 2012-05-30 15:13:03 -07:00