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

47282 Commits

Author SHA1 Message Date
Akshay Vishnoi f92ac245bd Grammar correction in ActiveSupport CHANGELOG [ci skip] 2014-09-18 02:27:18 +05:30
Rafael Mendonça França 026289e28e Merge pull request #16948 from akshay-vishnoi/docs-rails-4point2 
[ci skip] ActiveSupport CHANGELOG fixes
 2014-09-17 17:28:50 -03:00
Akshay Vishnoi 7a8fb281d8 [ci skip] ActiveSupport CHANGELOG fixes 
1. spacing issues
2. spelling correction
3. grammar correction
4. Add missing docs
 2014-09-18 01:55:29 +05:30
Abdelkader Boudih 402ac43bb5 Merge pull request #16930 from todd/upgrade_guide 
Added Responders docs, made Web Console docs more consistent. [ci skip]
 2014-09-17 21:03:51 +01:00
Rafael Mendonça França 1bf1386a2b Merge pull request #16944 from akshay-vishnoi/docs-rails-4point2 
[ci skip] AJ docs fixes
 2014-09-17 16:58:57 -03:00
Akshay Vishnoi 9fddcdd99e [ci skip] AJ docs fixes 
1. Indentation
2. Spaces issues
3. Spelling correction
4. Grammar correction
5. Add #:nodoc: to all internal classes
 2014-09-18 01:16:53 +05:30
Rafael Mendonça França 168c0c171e Use has_attribute? 2014-09-17 16:26:49 -03:00
Rafael Mendonça França afa4780572 Merge pull request #16875 from alan/dont_autosave_has_one_through_record 
Don't autosave unchanged has_one through records

Conflicts:
	activerecord/CHANGELOG.md
 2014-09-17 16:26:35 -03:00
Rafael Mendonça França 3fd016b2dc Merge pull request #16943 from sgrif/sg-fix-tz-converter-serialization 
Allow YAML serialization when using TZ aware attributes
 2014-09-17 16:20:03 -03:00
Rafael Mendonça França acda46d081 Merge pull request #11794 from yoazt/duration-eql 
Added method `#eql?` to `ActiveSupport::Duration`, in addition to `#==`.

Conflicts:
	activesupport/CHANGELOG.md
	activesupport/lib/active_support/duration.rb
	activesupport/test/core_ext/duration_test.rb
 2014-09-17 16:15:25 -03:00
Rafael Mendonça França 84087966e8 Merge pull request #16929 from kongregate/fix-activerecord-deprecated_finders-find-symbol 
ActiveRecord deprecated finders are broken in 4.2
 2014-09-17 16:02:55 -03:00
Sean Griffin fab487228c Allow YAML serialization when using TZ aware attributes 2014-09-17 12:37:00 -06:00
Rafael Mendonça França 8c6c1dd82e OMG mysql! 2014-09-17 15:21:47 -03:00
Rafael Mendonça França 3d4046fff4 ruby-head should be green 
Ruby 2.2 is near to be released so we should support it properly
 2014-09-17 15:00:49 -03:00
Yves Senn 38b5e191f6 do not dump foreign keys for ignored tables. 2014-09-17 11:43:42 +02:00
Yves Senn 6d8221323f unify wording in Active Record CHANGELOG. [ci skip] 2014-09-17 11:25:30 +02:00
Yves Senn c1ab07cd91 pg, correctly dump foreign keys targeting tables in a different schema. 
Closes #16907.

[Matthew Draper & Yves Senn]
 2014-09-17 11:13:10 +02:00
Yukio Mizuta 7137c6b775 Specify dummy app's db migrate path in plugin's test_helper.rb 2014-09-16 20:21:17 -07:00
Steven Harman 6c941ea405 Consistently markup etag options. 2014-09-16 15:24:24 -04:00
Steven Harman 2210521040 Consistently capitalize ETag. 2014-09-16 15:23:24 -04:00
Rafael Mendonça França de33fe7d7e Merge pull request #16844 from zerothabhishek/master 
[guides] 4.2 release notes: added technical details for Adequate Record
 2014-09-16 16:22:57 -03:00
Rafael Mendonça França fde7858ed6 Merge pull request #16841 from tjouan/environment-config-consistency 
Improve environment config templates consistency
 2014-09-16 16:09:41 -03:00
Thibault Jouan c9213e1033 Improve environment config templates consistency: 
* Fix long lines;
* Use simple quotes for string literals when interpolation is not used.
 2014-09-16 16:07:59 -03:00
abhishek 00e30b8f1c [guides] 4.2 release notes: added technical details for Adequate Record 2014-09-16 23:53:02 +05:30
stopdropandrew 6a3626b978 Backwards compat for activerecord-deprecated_finders 
Maintain compatibility for:
* ActiveRecord::Base#find(:all)
* ActiveRecord::Base#find(:first)
* ActiveRecord::Base#find(:last)
 2014-09-16 09:51:48 -07:00
Todd Bealmear a8571131b9 Added Responders docs, made Web Console docs more consistent. [ci skip] 2014-09-16 07:40:26 -07:00
Rafael Mendonça França 1bdb233bc2 Merge pull request #16790 from cirosantilli/explain-erb-space-removal 
Explain ERB space removal.

[ci skip]
 2014-09-16 11:14:28 -03:00
Rafael Mendonça França 6e4aa9d5ea Merge pull request #16914 from untidy-hair/fix_plugin_dummy_path_error 
Use dynamic path for dummy app location in plugin's test_helper.rb
 2014-09-16 10:51:29 -03:00
Rafael Mendonça França 0da9923926 Make explicit 4.1 is being maintained by a special situation 
[ci skip]
 2014-09-16 10:28:36 -03:00
Juanito Fatas 49f8356f33 [ci skip] Fix code snippet display in Action Mailer Basics guide. 2014-09-16 15:32:38 +08:00
Rafael Mendonça França 7d1feb0639 Merge pull request #16927 from akshay-vishnoi/fix-typo 
[ci skip] Fix typo `equals to` --> `equal to`
 2014-09-15 17:01:48 -03:00
Akshay Vishnoi 4a634e5f90 [ci skip] Fix typo `equals to` --> `equal to` 2014-09-16 01:15:00 +05:30
Alan Kennedy 93717f39b7 Don't autosave unchanged has_one through records 2014-09-15 15:34:39 +01:00
Matthew Draper 62955c77bf As of Unicode 6.3, Mongolian Vowel Separator is not whitespace 
Ruby 2.2 knows this, and no longer matches it with [[:space:]], so it's
not a good candidate for testing String#squish.
 2014-09-15 21:41:25 +09:30
Jeremy Kemper c0a4a300f7 Merge pull request #16574 from lsylvester/duration-respond_to 
add implementation of respond_to? for ActiveSupport::Duration
 2014-09-14 22:20:58 -07:00
lsylvester f9767514cb add implementation of respond_to? for ActiveSupport::Duration 2014-09-15 13:59:19 +10:00
Godfrey Chan a3a8a691b2 Merge pull request #16922 from y-yagi/add_test_jobs_task 
Add test jobs task
 2014-09-15 08:57:58 +08:00
yuuji.yaginuma 14f07fdc07 Add `test:jobs` task 2014-09-15 09:43:02 +09:00
Aaron Patterson 8a47e87267 handle <%== nil %> cases 
This is much less common than string literal appends, so add a special
case method for it.  Maybe fixes bug reported by @jeremy on 97ef636191
 2014-09-14 17:11:13 -07:00
Jeremy Kemper ac941096bf Merge pull request #16920 from seuros/aj 
simplify test_adapter
 2014-09-14 16:15:38 -07:00
Abdelkader Boudih 2ceb3aada1 Merge pull request #16918 from kiuru/master 
Singular credit_card controller name changed to plural [ci skip]
 2014-09-14 23:22:01 +01:00
Abdelkader Boudih b820eb2027 simplify test_adapter 2014-09-14 22:11:52 +00:00
Jeremy Kemper e3a65c6d7c Tighten up AJ::Arguments and its tests 
* Disallow deserialization of non-primitive objects
* Broaden coverage; remove superfluous tests
 2014-09-14 14:11:26 -07:00
Jeremy Kemper 01ac23423d Pare down and simplify Active Job's rake tasks 2014-09-14 14:01:16 -07:00
Aaron Patterson 97ef636191 Stop nil checking on safe_append= 
ERB compiler guarantees safe_append= will be called with a string, so
nil checks don't make sense.  Anything else calling this method should
check for nil themselves before calling
 2014-09-14 13:26:39 -07:00
Yukio Mizuta 8c9b347342 Use dynamic path for dummy app location in plugin's test_helper.rb 2014-09-14 10:55:19 -07:00
Niko Kiuru 5ec944ed83 Singular credit_card controller name changed to plural 2014-09-14 20:40:43 +03:00
Jeremy Kemper e47b3e15ed Merge pull request #16912 from yuki24/rescue-rack-parameter-type-error 
Rescue `Rack::Utils::ParameterTypeError` instead of `TypeError`
 2014-09-13 18:02:45 -07:00
Jeremy Kemper 4a7d889ff4 Merge pull request #16758 from Agis-/time-change-nsec 
Add support for `:nsec` option to `Time#change`
 2014-09-13 18:01:29 -07:00
Yuki Nishijima 75eaefcc2f Rescue Rack::Utils::ParameterTypeError instead of TypeError 
As of rack/rack@167b648023, Rack raises
Rack::Utils::ParameterTypeError which inherits TypeError.

In terms of the behavior, Rescuing TypeError still works but this
method shouldn't rescue if TypeError is raised for other reasons.
 2014-09-13 16:54:20 -07:00