Commit Graph

47945 Commits

Author SHA1 Message Date
David Geukers
3b12abba3c Simplify rake test vs rake test:all
Renames `rake test:all` to `rake test` by changing old `rake test:run` to previous version of `rake test:all`.  Removes old definition of `rake test`. Also renames `rake test:all:db` to `rake test:db` and deprecates `rake test:all` & `rake test:all:db`
2014-11-10 20:33:31 -05:00
claudiob
d4ce2bb06d Remove unnecessary double space
Replaces the following in two places:

```diff
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
```
2014-11-10 22:29:45 -02:00
Rafael Mendonça França
99dccf1aae Merge branch 'rm-fix-secret-token-fallback' 2014-11-10 21:22:11 -02:00
Rafael Mendonça França
bda93b2bb2 ✂️ 2014-11-10 21:19:37 -02:00
Rafael Mendonça França
1d1239d328 No need to sync config.secret_token and secrets.secret_token
Just prefer secrets over config
2014-11-10 21:18:57 -02:00
Rafael Mendonça França
091652cae8 Merge pull request #16535 from bf4/patch-1
Allow fallback to LegacyKeyGenerator when secret_key_base is not set but secrets.secret_token is
2014-11-10 20:38:46 -02:00
Xavier Noria
0ed6ebcf90 dependencies.rb: keep the decorated #load and #require private [closes #17553] 2014-11-10 14:29:29 -08:00
Rafael Mendonça França
1906758210 Merge pull request #17585 from aderyabin/remove_limited_update_conditions
remove never called method `limited_update_conditions`
2014-11-10 20:35:23 -02:00
Andrey Deryabin
fd1364e021 remove never called method limited_update_conditions 2014-11-11 01:33:29 +03:00
Cody Cutrer
76e7305ea1 add a Table#name accessor like TableDefinition#name 2014-11-10 14:56:21 -07:00
Rafael Mendonça França
82e20030d4 Merge pull request #17579 from aderyabin/cleanup_sqlite
Tiny improvement in sqlite3 adapter
2014-11-10 18:01:21 -02:00
Andrey Deryabin
5e4a99821d tiny code improvement in sqlite3 adapter:
- remove unused method `supports_add_column?`
  - change additional restriction method to `valid_alter_table_type?`
  - fix code style
2014-11-10 22:55:40 +03:00
Rafael Mendonça França
7b7eea886a Merge pull request #17578 from codeodor/fix-17217-test-bug
Fix bug found when running individual tests against #17217 after merging
2014-11-10 17:44:29 -02:00
Rafael Mendonça França
2574212423 Merge pull request #11694 from Empact/association-bind-values-not-updated-on-save
Fix that a collection proxy could be cached before the save of the owner, resulting in an invalid proxy lacking the owner’s id

Conflicts:
	activerecord/CHANGELOG.md
2014-11-10 15:46:02 -02:00
Sammy Larbi
c7deaa8601 Fixes a bug found when running individual tests against #17217 after merging 2014-11-10 08:33:44 -06:00
Yves Senn
2a843b3538 docs, minor changes in Active Job documentation. [ci skip] 2014-11-10 14:56:07 +01:00
Godfrey Chan
6625000b73 Remove useless only_path: true in path helpers
We added a deprecation warning for these cases in aa1fadd, so these are now
causing deprecation warnings in the test output. AFAICT, in these two cases, the
option is not integral to the purpose of the test, so they can be safely removed
2014-11-10 00:47:25 -08:00
Godfrey Chan
aa6637d140 Pass the route name explicitly
Follow up to 212057b9. Since that commit, we need to pass the `route_name`
explicitly. This is one of the left-over cases that was not handled in that
commit, which was causing `use_route` to be ignored in functional tests.
2014-11-10 00:31:49 -08:00
Sean Griffin
52c3a16fa0 Revert the behavior of booleans in string columns to that of 4.1
Why are people assigning booleans to string columns? >_>

We unintentionally changed the behavior on Sqlite3 and PostgreSQL.
Boolean values should cast to the database's representation of true and
false. This is 't' and 'f' by default, and "1" and "0" on Mysql. The
implementation to make the connection adapter specific behavior is hacky
at best, and should be re-visted once we decide how we actually want to
separate the concerns related to things that should change based on the
database adapter.

That said, this isn't something I'd expect to change based on my
database adapter. We're storing a string, so the way the database
represents a boolean should be irrelevant. It also seems strange for us
to give booleans special behavior at all in string columns. Why is
`to_s` not sufficient? It's inconsistent and confusing. Perhaps we
should consider deprecating in the future.

Fixes #17571
2014-11-09 20:42:36 -07:00
Zachary Scott
cb0ba2f2b1 Merge pull request #17572 from rishijain/update_docs_10
Fixed grammar about AS::Notifications [ci skip]
2014-11-09 19:01:38 -08:00
Rishi Jain
30af171af1 added description for rails generators, and fixed sentence formation for active_support/notifications [ci skip] 2014-11-10 08:11:49 +05:30
Aaron Patterson
049caa9e5a Merge pull request #17217 from codeodor/fix-17119
Ensure HABTM relationships produce valid class names (Fixes #17119)
2014-11-09 15:07:56 -08:00
Sammy Larbi
f43f56e16e Ensure HABTM relationships produce valid class names (Fixes #17119) 2014-11-09 11:56:07 -06:00
betesh
f0d0c0fa1b Time includes DateAndTime::Zones acts_like(:time) 2014-11-09 11:44:56 -05:00
Robin Dupret
47704af54d Merge pull request #17564 from yui-knk/fix/command_line_guide
[ci skip] Fix typo in command_line.md
2014-11-09 15:42:37 +01:00
yui-knk
ec13bf0a99 [ci skip] Fix typo in command_line.md 2014-11-09 23:38:56 +09:00
Zachary Scott
90bf1c0498 Merge pull request #17563 from yui-knk/fix/source_annotation_extractor
[ci skip] Fix comment of SourceAnnotationExtractor#find_in
2014-11-08 19:23:57 -08:00
yui-knk
9cf3596da5 Fix comment of SourceAnnotationExtractor#find_in
Commit(810af6f) changed which extensions are taken into account,
so make to match comment of find_in.
And sort extensions to follow the added order.
2014-11-09 11:53:51 +09:00
Zachary Scott
001e600619 Documenting Rails::Info module [ci skip] 2014-11-08 16:40:13 -08:00
Vijay Dev
981afe42df Merge pull request #17557 from yui-knk/fix/command_line_guide
[ci skip] Fix line break on command line guide
2014-11-08 22:55:50 +05:30
Santiago Pastorino
a153fae6d9 Merge pull request #17559 from alfa-jpn/fix/singular_association_cache
default scopes should break the cache on singulur_association.
2014-11-08 11:24:52 -02:00
Robin Dupret
f8f02f4f6d Merge pull request #17476 from robin850/job-testing
Add a section about job testing [ci skip]
2014-11-08 12:36:58 +01:00
alfa-jpn
9bd4386850 default scopes should break the cache on singulur_association.
fixes #17495
2014-11-08 17:03:54 +09:00
yui-knk
b38c9eb631 [ci skip] Fix line break on command line guide 2014-11-08 11:22:42 +09:00
Aaron Patterson
cb976371e4 Merge pull request #17493 from petewest/duration-comparable
Delegate comparison operator to value
2014-11-07 16:43:25 -08:00
Aaron Patterson
c2fc9848b1 default scopes should break the cache on has_many.
if you specify a default scope on a model, it will break caching.  We
cannot predict what will happen inside the scope, so play it safe for
now.  fixes #17495
2014-11-07 16:23:15 -08:00
Yves Senn
a450cac35e Merge pull request #17552 from jipe/master
Guides: Corrected name for assigns key [ci skip]
2014-11-07 11:54:08 +01:00
Jimmy Petersen
5bdaf31628 Guides: Corrected name for assigns key [ci skip]
- Integration test example is now using 'articles' name
  for both path and assigns key.
2014-11-07 11:30:52 +01:00
Yves Senn
9253417909 pg tests, get rid of sql_types_test.rb. 2014-11-07 10:55:45 +01:00
Yves Senn
48e3edf9ad pg tests, only execute what's necessary. 2014-11-07 10:45:34 +01:00
Yves Senn
35f502e9b6 remove the last traces of OpenBase from our codebase. [ci skip] 2014-11-07 10:12:01 +01:00
Yves Senn
58f3cf9bcb docs, the abstract data type :timestamp was removed. See #15184 [ci skip] 2014-11-07 10:04:40 +01:00
Zachary Scott
6c399033be Merge pull request #17551 from y-yagi/fix_command_line_guide
[ci skip] modify default host in command line guide
2014-11-07 00:38:58 -08:00
yuuji.yaginuma
066faa09e2 [ci skip] modify default host in command line guide 2014-11-07 17:34:15 +09:00
Yves Senn
888ea6bf44 Merge pull request #17541 from OpenSourceProjects/meaninful_message
Print out a meaningful error when ActiveRecord::ReadOnlyRecord is raised
2014-11-07 09:03:25 +01:00
Franky W
d424ded6fd Print out a meaningful error when ActiveRecord::ReadOnlyRecord is raised
Currently, there is no messages which get printed out. Convoluted system
may have hooks that create other objects in which case we only fail with
no messages. This commit changes this information allowing you to know
which object is the one that actually raised the error.
2014-11-06 19:38:58 -08:00
Rafael Mendonça França
9a517b5a0b Merge pull request #17545 from marzapower/dirty_public_api
[Enh] Made the ActiveModel::Dirty#clear_attribute_changes method public
2014-11-06 16:59:07 -02:00
Daniele Di Bernardo
eb05774531 [Enh] Changed the visibility of the ActiveModel::Dirty#clear_attribute_changes method
In Rails 4.2 it is impossible to define a custom default value for a model's
attribute without making it appear as _changed?, especially when the model
is first initialized. Making this method publicly visible will allow such a behaviour,
without the need to use private APIs.
2014-11-06 19:56:20 +01:00
Rafael Mendonça França
001b270611 Merge pull request #17543 from rishijain/update_docs_9
added example of hash#except, and removed extra whitespaces [ci skip]
2014-11-06 16:42:49 -02:00
Rishi Jain
c0357d789b added example of hash#except, and removed extra whitespaces [ci skip] 2014-11-07 00:09:52 +05:30