Aaron Patterson
f78c5fbb96
use a queue rather than a list. fixes #12069
2013-10-28 13:42:49 -07:00
Yves Senn
f85c4c6912
Merge pull request #11564 from zzak/active_model_guide
...
[Guides] Active Model Basics [ci skip]
2013-10-28 09:39:37 -07:00
Yves Senn
c1ae3d7731
fix typo in comment [ci skip].
2013-10-28 10:08:55 +01:00
David Heinemeier Hansson
8bf3411de9
Fix typo
2013-10-27 19:49:15 -07:00
Carlos Antonio da Silva
8df1e6333f
Fix indentation [ci skip]
2013-10-27 22:47:21 -02:00
Rafael Mendonça França
6fb056e3b6
Merge pull request #12578 from jeradphelps/configurable_schema_migrations_table_name
...
Configurable name for schema_migrations table
Conflicts:
activerecord/CHANGELOG.md
2013-10-27 21:07:03 -02:00
Rafael Mendonça França
745d8a8e80
Merge pull request #12668 from arunagw/aa-improvments
...
Test fixed for app_generator
2013-10-27 15:52:11 -07:00
Arun Agrawal
97ac5ed2a7
Fixed tests for app_generator
...
Added test for jbuilder and web-console inclusion.
Added README.rdoc for test default files
2013-10-27 23:40:40 +01:00
Rafael Mendonça França
86f287e6cf
Remove warning of shadowing outer local variable
2013-10-27 20:18:08 -02:00
Rafael Mendonça França
8a00866099
Assert the return value in the test
2013-10-27 18:11:00 -02:00
Rafael Mendonça França
e17979e4f7
Merge pull request #12664 from jetthoughts/12242_includes_in_through_association
...
Skip `include_values` from through associations chains for building association scope
2013-10-27 13:05:19 -07:00
Rafael Mendonça França
16d81af529
Remove dead code after the skip_jbuilder option removal
2013-10-27 17:59:00 -02:00
Aaron Patterson
3aacb7ec78
remove the skip_jbuilder option, just rm it from the Gemfile
2013-10-27 16:49:17 -03:00
Aaron Patterson
79c2d23b93
add comments and fix variable name. oops, forgot to add this. orz!
2013-10-27 16:44:01 -03:00
Aaron Patterson
f6cf909476
remove unused methods
2013-10-27 16:37:28 -03:00
Aaron Patterson
2e11f8e321
Merge remote-tracking branch 'origin/master'
...
* origin/master:
Removal of javascript related gems when creating an app
Conflicts:
railties/lib/rails/generators/app_base.rb
2013-10-27 16:35:24 -03:00
Aaron Patterson
f5c5d21681
add an option to skip jbuilder
2013-10-27 16:32:49 -03:00
Aaron Patterson
4c5f03386d
fix variable name
2013-10-27 16:29:46 -03:00
Aaron Patterson
99cea666ab
add jbuilder web-console and sdoc to the GemEntry list
2013-10-27 16:29:10 -03:00
Paul Nikitochkin
6b71a1416c
Skip include_values
from through associations chains for building target scope
...
Fixes : #12242 , #9517 , #10240
2013-10-27 21:15:41 +02:00
Aaron Patterson
61c65a0aef
fix the class name
2013-10-27 16:12:56 -03:00
Aaron Patterson
93857528fd
refactor Gemfile template
2013-10-27 16:01:26 -03:00
Guillermo Iguaran
494b62826b
Merge pull request #12657 from robin850/skip-javascript
...
Removal of javascript related files when creating an app
2013-10-27 11:53:04 -07:00
Aaron Patterson
ba98adef08
use the GemfileGem object for more entries
2013-10-27 15:50:25 -03:00
Aaron Patterson
469eafa70f
add the database gem
2013-10-27 15:16:09 -03:00
Aaron Patterson
f77e211a01
get a list of gems when filling out the gemfile
2013-10-27 15:11:54 -03:00
Robin Dupret
84e261b930
Removal of javascript related gems when creating an app
...
Commit 0417bc8 add the coffee-rails and javascript runtime gems even
when passing the --skip-javascript option but this is not the desired
behavior.
Also remove all javascript related stuff in the generated application
such as the vendor/assets/javascripts folder.
2013-10-27 18:44:03 +01:00
Aaron Patterson
b7ca9b52fe
set accessors in the set_accessors! method
2013-10-27 14:37:04 -03:00
Rafael Mendonça França
41047172c3
Merge pull request #12661 from robin850/patch-10
...
Add a changelog entry for #12656 [ci skip]
2013-10-27 10:16:12 -07:00
David Heinemeier Hansson
6605231231
Add a note about ensuring the version is right for the adapter (since you might well have specified the right gem, but locked it to too low of a version)
2013-10-27 09:46:45 -07:00
Robin Dupret
cbb32ec244
Add a changelog entry for #12656 [ci skip]
2013-10-27 16:03:38 +01:00
Jerad Phelps
26638f0ac9
added schema_migrations_table_name to ActiveRecord::Base in order that the name of the schema migrations table can be configured.
...
consolidated test_schema_migrations_table_name tests
Added changelog entry
edited changelog
removed commented lines
removed reader
ensure the schema migrations table is reset at end of test
added entry to configuration guide
guides typo and changelog order
2013-10-27 08:50:35 -05:00
Guillermo Iguaran
094e31ce67
Merge pull request #12656 from dougcole/fix_strong_parameters_fetch
...
don't let StrongParameters mutate the hash with fetch
2013-10-26 20:08:05 -07:00
Doug Cole
7171111d3a
don't mutate hash with fetch
2013-10-26 19:22:31 -07:00
Santiago Pastorino
52199d1fd4
Merge pull request #12655 from rails/ps-remove-surprise-if-in-show-exception-middleware
...
Remove surprise if from show_exception middleware
2013-10-26 11:27:03 -07:00
Prem Sichanugrist
0f0630aaae
Remove surprise if from show_exception middleware
...
This increase the readability within the rescue block.
2013-10-27 00:55:22 +07:00
Rafael Mendonça França
db61355f71
Merge pull request #12648 from chrisledet/patch-1
...
Fixed typo with after_commit docs
2013-10-25 14:18:24 -07:00
Chris Ledet
6f511943f8
Fixed typo with after_commit docs
...
Fixed syntax error on `after_commit` docs
2013-10-25 16:59:48 -04:00
Yves Senn
dc8fac1cac
Merge pull request #12643 from severin/pg_cast_json_on_write
...
cast json values on write to be consistent with reading from the db.
2013-10-25 08:17:40 -07:00
Severin Schoepke
c3606afb2a
cast json values on write to be consistent with reading from the db.
...
See also commit 5ac2341fab689344991b2a4817bd2bc8b3edac9d
2013-10-25 17:05:42 +02:00
Yves Senn
0e918ea97a
prevent time_zone_aware_attributes
test leak. follow-up to #12633 .
2013-10-25 17:05:41 +02:00
Yves Senn
a0599535aa
only warn on leaked time zone state instead of rasing an error.
...
Raising `RuntimeErrors` skips important cleanup code and leads to
a lot of subsequent errors. This clutters the test output with a lot
of noise.
2013-10-25 15:59:04 +02:00
Yves Senn
2dc579baf4
Merge pull request #12633 from senny/no_more_time_zone_leaks
...
prevent global timezone state from leaking out of test cases.
2013-10-25 06:10:11 -07:00
Yves Senn
abe91cb3bf
prevent global timezone state from leaking out of test cases.
2013-10-25 14:40:57 +02:00
Rafael Mendonça França
3c3ffac011
Merge pull request #12642 from ka8725/fix_usage_for_model_generators
...
Improve usage example for model generator decimal field
2013-10-25 05:22:57 -07:00
Andrey Koleshko
b5973cf5e5
Improve usage example for model generator
2013-10-25 15:20:04 +03:00
Rafael Mendonça França
03deb47764
Merge pull request #12641 from jetthoughts/12640_updated_migrations_doc_to_use_remove_column
...
Fix migration docs to use new remove_column semantics
2013-10-25 05:10:37 -07:00
Paul Nikitochkin
e25185622a
Fix migration docs to use new remove_column semantics
...
Fixes : #12640
2013-10-25 12:16:00 +03:00
Yves Senn
abeff5e645
Merge pull request #12490 from senny/store_accessor_hstore_bug
...
ActiveRecord Store works with PG `hstore` columns
2013-10-24 23:48:39 -07:00
Yves Senn
0492ea6d39
ActiveRecord::Store
works together with PG hstore
columns.
...
This is necessary because as of 5ac2341 `hstore` columns are always stored
as `Hash` with `String` keys. `ActiveRecord::Store` expected the attribute to
be an instance of `HashWithIndifferentAccess`, which led to the bug.
2013-10-25 08:35:35 +02:00