TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
36,638 Commits 2 Branches 0 Tags 294 MiB
d98ab530cb
Commit Graph

4604 Commits

Author SHA1 Message Date
Carlos Antonio da Silva
6a3794b404 Merge pull request #9997 from vipulnsward/hash_destructive_merge 
Change merge to merge! to avoid creating new objects
 2013-03-30 08:55:16 -07:00
Carlos Antonio da Silva
2432469e7f Merge pull request #10007 from vipulnsward/fix_AS_typos 
Fix some typos in AS
 2013-03-30 08:47:06 -07:00
Vijay Dev
6d8c070821 Merge branch 'master' of github.com:lifo/docrails 
Conflicts:
	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
	activerecord/test/cases/adapter_test.rb
	guides/source/testing.md

[ci skip]
 2013-03-30 15:46:14 +05:30
Vipul A M
5a0e583f40 fix some typos in AS 2013-03-30 14:01:42 +05:30
Vipul A M
bd674fd4e5 change merge to merge! 2013-03-29 20:58:46 +05:30
Xavier Noria
341e611547 determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn] 2013-03-28 10:04:39 +01:00
Rafael Mendonça França
57fbcc5247 Merge pull request #9523 from stopdropandrew/Instrumenter#instrument-yields-payload 
ActiveSupport::Notifications::Instrumenter#instrument should yield

Conflicts:
	activesupport/CHANGELOG.md
 2013-03-27 17:43:33 -03:00
Zolzaya
d2a8f7e822 Fixed timezone mapping of Ulaanbaatar. 2013-03-27 00:23:50 +08:00
kennyj
4ed4cfd5ed Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data. 2013-03-26 02:12:49 +09:00
Akira Matsuda
ea5daeb2e4 Fix some typos 2013-03-25 22:43:26 +09:00
Albert Lash
0788d35a05 Updated docs due to removal of serializer accessor 2013-03-24 15:46:46 -03:00
Rafael Mendonça França
e600384515 Merge pull request #8501 from charliesome/version-to-s 
Add #to_s method to VERSION modules
 2013-03-23 18:51:16 -07:00
Prathamesh Sonpatki
573df1cf2a Using American English spellings over British style spellings 2013-03-21 20:41:45 +05:30
Charlie Somerville
c07e1515f7 Add version method to top level modules 2013-03-21 19:56:07 +11:00
Intrepidd
9c025ab6e9 Tidying up some require : removing useless sort and homogenizing with the rest of the code the wat the includes are done 2013-03-20 18:24:48 +00:00
Vipul A M
ca9fc5aea7 remove unused payloads in blocks in caching instrumentation 2013-03-19 22:09:47 +05:30
kennyj
445bc3a200 Fix warning: mismatched indentatmmismatched indentations at 'end' with 'def' 2013-03-19 20:52:20 +09:00
Xavier Noria
ddd2c75b26 Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]" 
This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57.
 2013-03-18 21:19:47 +01:00
Xavier Noria
c24528fbc9 instruct RDoc to only parse Ruby files under lib [Fixes #9779] 2013-03-18 20:36:32 +01:00
Aaron Patterson
2392535f40 Merge branch 'master-sec' 
* master-sec:
  fix protocol checking in sanitization [CVE-2013-1857]
  JDOM XXE Protection [CVE-2013-1856]
  fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]
  stop calling to_sym when building arel nodes [CVE-2013-1854]
 2013-03-18 10:17:32 -07:00
Andrew White
341f9a0799 Merge pull request #9774 from senny/9772_reraise_no_method_error_in_proper_context 
`TimeWithZone` raises `NoMethodError` in proper context.
 2013-03-18 09:49:44 -07:00
Yves Senn
836ea9fb42 TimeWithZone raises NoMethodError in proper context. 
Closes #9772.

`TimeWithZone` delegates everything to the wrapped `Time` object
using `method_missing`. The result is that `NoMethodError` error
will be raised in the context of `Time` which leads to a misleading
debug output.
 2013-03-18 17:41:34 +01:00
Vipul A M
4bd8ccd984 fix repeat of test; remove unused variable by use of each_key 2013-03-18 19:58:02 +05:30
Carlos Antonio da Silva
28cb11045b Merge pull request #9757 from vipulnsward/remove_message_param 
remove unused parameter passed to assert_query_equal method
 2013-03-17 08:35:06 -07:00
Carlos Antonio da Silva
be1a7ebbbc Merge pull request #9758 from vipulnsward/remove_from_rakefile 
Remove extra lines from Rakefile, which threw warning
 2013-03-17 07:19:14 -07:00
Vipul A M
b9f7e634ad refactor test to drop unnecessary hash creation, test directly instead 2013-03-17 16:21:33 +05:30
Vipul A M
3d10b7a81c extra lines from Rakefile removed, which also threw warning 2013-03-17 15:32:47 +05:30
Vipul A M
c7ea42c244 remove unused parameter passed to assert_query_equal method 2013-03-17 15:15:00 +05:30
Steve Klabnik
feaa6e2048 Revert "Merge pull request #8156 from fredwu/acronym_fix-master" 
This reverts commit 867dc1700f32aae6f98c4651bd501597e6b52bc0, reversing
changes made to 9a421aaa8285cf2a7ecb1af370748b0337818930.

This breaks anyone who's using ForceSSL: https://travis-ci.org/rails-api/rails-api/jobs/5556065

Please see comments on #8156 for some discussion.
 2013-03-16 15:25:49 -07:00
Xavier Noria
e958eabeb1 revises the CHANGELOG entry from 26aa265 [ci skip] 2013-03-16 16:03:09 +01:00
Fred Wu
26aa26564d Added Inflector#underscore fix to the changelog 2013-03-17 00:32:28 +11:00
Fred Wu
515feb1fd6 Fixed a bug where the inflector would replace camelCase strings and disregarding specified acronyms, fixes #8015 2013-03-17 00:31:00 +11:00
Ben Murphy
db8b636e50 JDOM XXE Protection [CVE-2013-1856] 2013-03-15 17:46:15 -07:00
Steve Klabnik
1a9055073d Revert "make new rails apps log to STDOUT" 
This reverts commit b7d9d6e2cd5082d269dafbc0316e2107febe1451.

Per discussion with @jeremy and @rubys on Campfire.
 2013-03-15 10:38:00 -07:00
Terence Lee
b7d9d6e2cd make new rails apps log to STDOUT 2013-03-15 10:05:10 -07:00
Andrew White
dff86e6ea0 Add regression tests for #9678 
The bug with `ActiveSupport::TimeZone.parse` described in #9678 was
unwittingly fixed in 005d910 so add some tests to prevent regression.
 2013-03-13 05:46:34 +00:00
Aaron Patterson
7169e4c715 removing out of date comment. ❤️❤️❤️❤️❤️❤️❤️❤️❤️❤️❤️❤️ @pixeltrix 2013-03-12 14:15:01 -07:00
Aaron Patterson
ed9e3f699a drop memory consumption and startup speed by switching to define_method 2013-03-12 14:10:21 -07:00
Carlos Antonio da Silva
6e07658fcf Remove manual "return true" from AS::TZ match method 2013-03-12 10:10:18 -03:00
Carlos Antonio da Silva
466ff9310a Merge pull request #9681 from vipulnsward/fix_typo_in_module_name 
Fix typo in DependenciesTestHelpers module name
 2013-03-12 03:55:30 -07:00
Vipul A M
8778e1c4af Fix typo in DependenciesTestHelpers module name 2013-03-12 10:33:32 +05:30
Vipul A M
647a9abb02 Cleanup tests for unused variables 2013-03-11 16:03:10 +05:30
Paul Nikitochkin
20ae0d0e39 Fixed tests for returning an instance of Time in the local system timezone. 2013-03-10 23:57:11 +02:00
Gernot
0bfaa2cc9c included "Montevideo" in list of time zone aliases (closes Issue #9628) 2013-03-09 20:08:32 -02:00
Yves Senn
f8b0e54939 CHANGELOG entry for improved singularizing of singulars. 
Closes #9559.

The actual patch was added with #4719
 2013-03-06 08:28:23 +01:00
Aman Gupta
cc986db546 Call String#gsub with Hash directly 2013-03-04 20:09:21 -08:00
Aaron Patterson
54f9b7584d only calculate next_id when we need a new method defined 2013-03-04 10:52:07 -08:00
stopdropandrew
a007800a55 ActiveSupport::Notifications::Instrumenter#instrument should yield 
its payload the same way that ActiveSupport::Notifications does.
Fix spelling in test name.
 2013-03-02 16:05:05 -08:00
Carlos Antonio da Silva
9126d53a07 Enforce i18n version >= v0.6.4 
Keep in sync with 3-2-stable.
 2013-02-27 21:08:27 -03:00
Steve Klabnik
5112a6ccdf Move AS CHANGELOG entry up. 
I merged b883706 but forgot to move the entry past beta1.
 2013-02-26 11:21:37 -08:00