TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
42,123 Commits 2 Branches 0 Tags 294 MiB
2248684d0b
Commit Graph

42123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yves Senn
2248684d0b Merge pull request #13968 from kintamanimatt/fix-wordy-sentence 
Fix wordy sentence [ci-skip]
 2014-02-07 15:09:13 +01:00
Matthew Nicholas Bradley
bb87c16ad9 Fix wordy sentence 2014-02-07 14:03:39 +00:00
Yves Senn
e3d8194582 Merge pull request #13962 from iwiznia/test_controller_skip_action_class 
Test for skipping a controller filter set up with a class Part 3
 2014-02-07 08:35:18 +01:00
Ionatan Wiznia
f8d740af93 Tests that skips a controller filters that was set up using a class 2014-02-06 20:11:40 +01:00
Xavier Noria
c0fb8d0b9c Merge branch 'dump-schema-after-migration-flag' of git://github.com/emilsoman/rails into emilsoman-dump-schema-after-migration-flag 
Conflicts:
	activerecord/CHANGELOG.md
 2014-02-06 15:03:20 +01:00
Emil Soman
8806768e9f Add config to disable schema dump after migration 
* Add a config on Active Record named `dump_schema_after_migration`
* Schema dump doesn't happen if the config is set to false
* Set default value of the config to true
* Set config in generated production environment file to false
* Update configuration guide
* Update CHANGELOG
 2014-02-06 17:38:31 +05:30
Yves Senn
7f648bc70e docs, Associations also raise on name conflicts. [ci skip] 
Follow up to 580f0b61dc (commitcomment-5293470)
 2014-02-06 12:18:46 +01:00
Yves Senn
580f0b61dc synchronize 4.1 release notes with CHANGELOGS. [ci skip] 
/cc @chancancode
 2014-02-06 11:43:16 +01:00
dpmehta02
b9ead0feb0 update contribution doc grammar. [ci skip] 
- Manually applied from #13951.
- Discussion at #13947.
- Removed trailing whitespace from 18044e86af

/cc @dpmehta02
 2014-02-06 09:39:09 +01:00
Rafael Mendonça França
c82dbc6a1c Fix to_query with empty arrays too 2014-02-06 01:03:41 -02:00
Rafael Mendonça França
7aa4b7dc6b Add CHANGELOG entry 
Closes #13909
 2014-02-05 23:55:50 -02:00
Rafael Mendonça França
ab51b285e2 Refatoring the method to avoid shot-circuit return 2014-02-05 23:55:17 -02:00
Rafael Mendonça França
d6e3fd775b Test with a blank value 2014-02-05 23:47:16 -02:00
Rafael Mendonça França
88b064dfae Move test to the right file 2014-02-05 23:42:43 -02:00
Hincu Petru
326e652749 Fixed "Hash#to_param confused by empty hash values #13892" 2014-02-05 23:31:50 -02:00
Rafael Mendonça França
6cc3afb00a Merge pull request #13953 from seanwalbran/fix-humanize-match-reference 
fix interplay of humanize and html_escape
 2014-02-05 23:07:01 -02:00
Sean Walbran
26698fb91d fix interplay of humanize and html_escape 2014-02-05 17:19:51 -06:00
Rafael Mendonça França
84fe7b7db6 Merge pull request #13938 from marcandre/sized_enumerator 
Sized enumerator
 2014-02-05 20:10:45 -02:00
Marc-Andre Lafortune
a476020567 Return sized enumerator from Enumerable#index_by 2014-02-05 16:53:58 -05:00
Marc-Andre Lafortune
13d2696c10 Return sized enumerator from Batches#find_each 2014-02-05 16:53:02 -05:00
Marc-Andre Lafortune
d37f395be8 Return sized enumerator from Batches#find_in_batches 2014-02-05 16:49:29 -05:00
Marc-Andre Lafortune
4499ab5fde Strengthen test with different nb of rows and columns 2014-02-05 16:45:56 -05:00
Marc-Andre Lafortune
39b2cc1900 Remove obsolete test (builtin group_by is now used) 2014-02-05 16:45:55 -05:00
Marc-Andre Lafortune
4c3e11d30a Remove obsolete line (was needed for Ruby 1.8.7 support) 2014-02-05 16:45:55 -05:00
Yves Senn
1df4dcf7dd remove gemnasium batch from README. [ci skip] 
The rails/rails gemnasium page (https://gemnasium.com/rails/rails) is not helping much.
It lists 0 dependencies so there is not much to track. Also our gems mostly depend
on other gems we control. There is not much point in monitoring them.

The batch was introduced with #3909.
 2014-02-05 15:18:47 +01:00
Arun Agrawal
10867a77be Removed unused commented code [ci skip] 
As discussed in #13940 this can be removed
We can document this somewhere else in testing guides.
 2014-02-05 11:14:24 +01:00
Arun Agrawal
069a010277 Merge pull request #13950 from calvintam/fix_typos 
Fixed typos
 2014-02-05 10:41:01 +01:00
Calvin Tam
128fa3b9a4 Fixed typos [ci skip] 2014-02-05 20:37:26 +11:00
Yves Senn
132834bc6a Merge pull request #13949 from vajrasky/fix_typo_column_definition_test 
Fixed typos in column_definition_test.rb.
 2014-02-05 10:14:00 +01:00
Vajrasky Kok
38777949f0 Fixed typo in column_definition_test.rb. 2014-02-05 16:51:34 +08:00
Yves Senn
3ba0eeda02 docs, AR already auto-detects primary keys. Closes #13946. [ci skip] 
This behavior was introduced since Rails 3.1 (207f266ccaaa9cd04cd2a7513ae5598c4358b510)
but the docs were still out of date.
 2014-02-05 08:52:59 +01:00
Rafael Mendonça França
f92142dce1 Document that enum conditions must use the ordinal value 
[ci skip]
 2014-02-04 15:27:57 -02:00
Rafael Mendonça França
90794325cf Merge pull request #13943 from loganhasson/master 
[ci skip] Add missing 'task' to note on Running Migrations
 2014-02-04 08:45:28 -08:00
Logan Hasson
e9bfa28b1a [ci skip] Add missing 'task' to note on Running Migrations 2014-02-04 11:43:26 -05:00
Rafael Mendonça França
404cb36ee3 Add CHANGELOG entry for #13935 [ci skip] 2014-02-04 12:13:14 -02:00
Rafael Mendonça França
f1a6307a94 Merge pull request #13935 from arthurnn/fix_12566 
Make sure transaction state resets after commit
 2014-02-04 06:03:14 -08:00
Arun Agrawal
75510a62f1 Merge pull request #13940 from gregmolnar/guides 
add missing sharp [ci skip]
 2014-02-04 04:58:04 -08:00
Greg Molnar
d3edf1ea82 add missing sharp [ci skip] 2014-02-04 13:54:22 +01:00
Yves Senn
c7abc516f8 docs, link MySQL manual for multi column indexes. [ci ckip]. 
Closes #9131.
 2014-02-04 13:38:48 +01:00
Rafael Mendonça França
702e0e1a6b Merge pull request #13899 from Fortisque/kevin/active_record_HABTM_with_belongs_to 
destruction errors out on HABTM w/out primary key
 2014-02-04 04:11:46 -08:00
Yves Senn
7d196cf360 #to_param returns nil if to_key returns nil. Closes #11399. 
The documentation of `#to_key` (http://api.rubyonrails.org/classes/ActiveModel/Conversion.html#method-i-to_key)
states that it returns `nil` if there are no key attributes. `to_param` needs
to be aware of that fact and return `nil` as well.

Previously it raised the following exception:

```
  1) Error:
ConversionTest#test_to_param_returns_nil_if_to_key_is_nil:
NoMethodError: undefined method `join' for nil:NilClass
    /Users/senny/Projects/rails/activemodel/lib/active_model/conversion.rb:65:in `to_param'
    /Users/senny/Projects/rails/activemodel/test/cases/conversion_test.rb:34:in `block in <class:ConversionTest>'
```
 2014-02-04 10:27:46 +01:00
Guillermo Iguaran
a5dd1d2490 Merge pull request #13936 from edogawaconan/fix_docs 
Missing closing parenthesis. [ci skip]
 2014-02-03 19:20:52 -08:00
edogawaconan
b10f45ce75 Missing closing parenthesis. 2014-02-04 11:46:59 +09:00
Arthur Neves
9b66d6d47f Make sure transaction state resets after commit 
[fixes #12566]
 2014-02-03 15:49:48 -05:00
Yves Senn
28abd967fc Merge pull request #11770 from timruffles/doc_ajax_xhr 
be more specific about csrf token and ajax - not whitelisted outside of jquery-rails [ci skip]
 2014-02-03 08:38:44 -08:00
Yves Senn
dd493d3b6f docs, be clear that options is a hash. Closes #11904. [ci skip]. 2014-02-03 16:42:02 +01:00
Yves Senn
06dde5fbf5 some wording format changes. [ci skip] 2014-02-03 14:52:01 +01:00
Yves Senn
584a46479b pass habtm :autosave to underlying hm:t association. Closes #13923. 2014-02-03 14:48:59 +01:00
Yves Senn
b7c7cb1a63 docs, revisit polymorphic associations with STI example. [ci skip] 
This is a follow up to #13926.

/cc @fxn
 2014-02-03 13:38:14 +01:00
Yves Senn
c46b0d1023 docs, reference to ruby-lang.org. refs #13492. [ci skip] 2014-02-03 12:01:32 +01:00