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

49077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carlos Antonio da Silva
a22a653c29 Fix Active Job changelog formatting and reword a bit [ci skip] 2015-01-08 07:40:00 -02:00
David Heinemeier Hansson
e54719df66 Merge pull request #18397 from georgeclaghorn/enhance-job-assertions 
Add :only option to assert_enqueued_jobs
 2015-01-07 21:07:17 -08:00
George Claghorn
b5e88317cc Add :only option to assert_enqueued_jobs 
With the option, assert_enqueued_jobs will check the number of times a specific kind of job is enqueued.
 2015-01-07 23:44:08 -05:00
Godfrey Chan
f6b21d48ef Merge pull request #16640 from mfazekas/fix_loop_in_changed_for_autosave 
Fix potenital infinite recursion in changed_for_autosave?
 2015-01-07 15:56:50 -08:00
Sean Griffin
af2e0fec09 Merge pull request #18377 from brainopia/custom_connection_with_count 
Fix count on a separate connection
 2015-01-07 15:59:15 -07:00
brainopia
824862807b Fix count on a separate connection (fixes #18359) 
Previosly count and other AR calculations would convert
column_name_for_operation to sql on a default Arel::Table.engine
(AR::Base) connection. That could lead to trouble if current
model has a connection to a different adapter or Base connection
is inaccessible.
 2015-01-08 01:42:33 +03:00
Carlos Antonio da Silva
9892d445bc Merge pull request #18378 from shunsukeaida/avoid_orm_being_humanized_in_generator_help_message 
Overwrite descriptions generated by Generators::Base to respect acronym.
 2015-01-07 09:27:17 -02:00
Carlos Antonio da Silva
f9e0ec5449 Move changelog entry to the top [ci skip] 2015-01-07 07:44:57 -02:00
shunsukeaida
884d123e13 acronyms like ORM should be in uppercase, so overwrite the desc generated by hook_for 2015-01-07 13:04:57 +09:00
Rafael Mendonça França
5d28c6b5b8 Merge pull request #18074 from caike/master 
Add _mailer suffix to generated file names.
 2015-01-06 19:41:18 -03:00
brainopia
08d3f0e3b3 Remove ActionController::HideActions (closes #18336) 2015-01-06 23:40:45 +03:00
Carlos Antonio da Silva
362acba04e Use Ruby's #include? to avoid relying on AS extension 
The build has failed when running the date/time ext tests in isolation
due to the missing extension, so better than adding a require is using
just Ruby in this case.

https://travis-ci.org/rails/rails/jobs/46107954#L1077
 2015-01-06 17:17:15 -02:00
Carlos Antonio da Silva
f542ffeffc Merge pull request #18368 from kuldeepaggarwal/fix-attribute-scope 
fix `attribute` method scoping(i.e. private)
 2015-01-06 17:07:49 -02:00
Guillermo Iguaran
b1124a2ac8 Merge pull request #18370 from LindseyB/patch-1 
Changing sets -> set [ci-skip]
 2015-01-06 13:15:28 -05:00
Lindsey Bieda
c6117b6be1 Changing sets -> set 
Updating some minor grammar issue.
 2015-01-06 13:08:34 -05:00
David Heinemeier Hansson
0d2854326e Merge pull request #18335 from georgeclaghorn/day-gymnastics 
Add #weekend?, #next_weekday, and #prev_weekday methods to Date, Time, and DateTime
 2015-01-06 08:49:29 -08:00
Kuldeep Aggarwal
d4c5406279 fix attribute method scoping(i.e. private) 
ref #52f641264b1325a4c2bdce7971b14524bd4905f1
 2015-01-06 21:46:35 +05:30
Carlos Souza
5697bdbb6d Add mailer suffix to generated files and classes 
Following the same naming convention used in
controllers and jobs.
 2015-01-06 10:46:22 -05:00
Rafael Mendonça França
cc274c3f18 Merge pull request #18366 from codeodor/patch-1 
Add log_level options to configuration guide
 2015-01-06 12:43:19 -03:00
Sammy Larbi
f0466b619b Add log_level options to configuration guide 2015-01-06 08:52:00 -06:00
Rafael Mendonça França
52f641264b Merge pull request #18362 from georgemillo/attribute 
replacing 'attribute' method with an alias
 2015-01-06 11:16:49 -03:00
Abdelkader Boudih
8554977c42 Merge pull request #18364 from prathamesh-sonpatki/ar-changelog-typos 
Fixed typos and wording in ActiveRecord CHANGELOG [ci skip]
 2015-01-06 13:26:37 +00:00
Prathamesh Sonpatki
0e3eca8a93 Fixed typos and wording in ActiveRecord CHANGELOG [ci skip] 2015-01-06 18:39:58 +05:30
Yves Senn
dd54b518ce Merge pull request #18358 from prathamesh-sonpatki/add-test-for-non-string-labeled-fixtures 
Fix lookup of fixtures with non-string(like Fixnum) label
 2015-01-06 13:31:50 +01:00
George Millo
ff286eb3e3 replacing 'attribute' method with an alias 2015-01-06 12:20:58 +00:00
Prathamesh Sonpatki
8da936a5d3 Fix lookup of fixtures with non-string label 
- Fixtures with non-string labels such as integers should be accessed
   using integer label as key. For eg. pirates(1) or pirates(42).
 - But this results in NotFound error because the label is converted into string before
   looking up into the fixtures hash.
 - After this commit, the label is converted into string only if its a
   symbol.
 - This issue was fount out while adding a test case for
   https://github.com/rails/rails/commit/7b910917.
 2015-01-06 17:15:39 +05:30
George Claghorn
4c53f58a0f Add #prev_day and #next_day as counterparts to #yesterday and #tomorrow for Date, Time, and DateTime 2015-01-06 05:43:41 -05:00
George Claghorn
b6d0d0d106 Add same_time option to #prev_week and #next_week for Date, Time, and DateTime 2015-01-06 05:43:06 -05:00
George Claghorn
adf5fc3b3c Add #on_weekend?, #next_weekday, and #prev_weekday methods to Date, Time, and DateTime 
`#on_weekend?` returns true if the receiving date/time falls on a Saturday or
Sunday.

`#next_weekday` returns a new date/time representing the next day that does
not fall on a Saturday or Sunday.

`#prev_weekday` returns a new date/time representing the previous day that
does not fall on a Saturday or Sunday.
 2015-01-06 05:42:37 -05:00
David Heinemeier Hansson
de4f40826e Merge pull request #18354 from simi/improve-request-forgery-documentation 
Improve protect_from_forgery documentation.
 2015-01-05 17:36:01 -08:00
Rafael Mendonça França
896a6b1aed Merge pull request #18356 from georgemillo/singularize 
removing unecessary default parameter in private method
 2015-01-05 22:08:33 -03:00
Sean Griffin
c24e9c9be4 Merge pull request #18355 from georgemillo/docs 
Documenting 'remove_possible_method' and 'redefine_method' [ci skip]
 2015-01-05 17:14:14 -07:00
George Millo
fc933fd4ab removing unecessary parameter in private method 
'_singularize' only ever gets called with one argument
 2015-01-06 00:10:56 +00:00
Sean Griffin
1ab7eba89b Merge pull request #18350 from brainopia/fix_build_from_bind_values 
Propagate bind_values from join in subquery
 2015-01-05 17:09:23 -07:00
George Millo
af211a1e07 adding documentation for 'remove_possible_method' and 'redefine_method' [ci skip] 2015-01-05 23:47:32 +00:00
Josef Šimánek
734306612e Improve protect_from_forgery documentation. [ci skip]. 2015-01-06 00:37:37 +01:00
brainopia
42e386173f Correctly fetch bind_values from join in subquery 2015-01-06 02:29:03 +03:00
Sean Griffin
00dad0343b Define attribute methods before attempting to populate records 
`initialize_internals_callback` will attempt to assign attributes from
the current scope, which will fail if something defined the method
and calls super (meaning it won't hit `method_missing`).

Fixes #18339
 2015-01-05 14:46:27 -07:00
Sean Griffin
3d0c718644 Whitespace fixes from #18349 2015-01-05 14:20:23 -07:00
Sean Griffin
08d6eb2370 Merge pull request #18349 from jdelStrother/primarykeyless 
Fix rollback of primarykey-less tables
 2015-01-05 14:19:01 -07:00
Jonathan del Strother
f634c1fcf4 Fix rollback of primarykey-less tables 
If you have a table without a primary key, and an `after_commit` callback on that table (ie `has_transactional_callbacks?` returns true), then trying to rollback a transaction involving that record would result in “ActiveModel::MissingAttributeError: can't write unknown attribute ``”
 2015-01-05 20:47:41 +00:00
Rafael Mendonça França
1c8192669f Avoid changing the global state on the tests 2015-01-05 14:39:52 -03:00
Rafael Mendonça França
d76bf34b04 Merge pull request #17676 from tigrish/fix_custom_i18n_exception_handler_regression 
Fix I18n regression introduced by #13832
 2015-01-05 14:35:50 -03:00
Rafael Mendonça França
f493a4122e Merge pull request #17720 from rzane/firebird-test-support 
Add Firebird support to test suite
 2015-01-05 13:35:05 -03:00
Ray Zane
ac41f6a5d7 Add firebird support to test suite 2015-01-05 13:34:59 -03:00
Rafael Mendonça França
d972537faa Merge pull request #18344 from jonatack/patch-1 
Clean up secure_token_test
 2015-01-05 12:31:37 -03:00
Rafael Mendonça França
d26e788ff2 Merge pull request #18345 from mtthgn/patch-1 
Fix TypeError in Fixture creation
 2015-01-05 12:13:56 -03:00
Matt Hogan
7b910917d3 Fix TypeError in Fixture creation 
Ruby 4.2 started doing `value.gsub('$LABEL', label)` for fixture label interpolation, but you can have have valid YAML where `label` isn't a String. 

For example:

```YAML
0:
  name: John
  email: johndoe@gmail.com
1:
  name: Jane
  email: janedoe@gmail.com
```

This YAML will create a label that is a Fixnum, causing `TypeError: no implicit conversion of Fixnum into String.`
 2015-01-05 09:02:44 -06:00
Jon Atack
2f05036cdd Clean up secure_token_test 2015-01-05 15:41:53 +01:00
Xavier Noria
ed21e18166 reflects changes in 34cd7e2 in the index [ci skip] 2015-01-05 14:37:52 +01:00