Commit Graph

40543 Commits

Author SHA1 Message Date
Alex Johnson
178c4f74f9 Update pull request instructions as per the new Github UI
[ci skip]
2013-10-30 13:25:28 +05:30
Yves Senn
609bc40904 Merge pull request #12653 from releu/short_arrays_in_inspect
Short arrays in record.inspect
2013-10-30 00:50:36 -07:00
Jan Bernacki
510601ce8e short arrays in inspect 2013-10-30 08:47:54 +04:00
Guillermo Iguaran
a5e2800221 Merge pull request #12692 from dmathieu/session_fetch
Add session#fetch
2013-10-29 12:59:40 -07:00
Damien Mathieu
84c9f4164b add the fetch method to sessions 2013-10-29 20:37:15 +01:00
Rafael Mendonça França
671af0716d Merge pull request #12693 from carpodaster/convert-cdata-input-to-string
Convert CDATA input to string before gsub'ing
2013-10-29 12:29:14 -07:00
Carsten Zimmermann
805a6cc564 Convert CDATA input to string before gsub'ing
Rails 3.2 API allowed arbitrary input for cdata_section;
this change re-introduces the old behaviour.
2013-10-29 18:17:57 +01:00
Yves Senn
df2226ea16 Merge pull request #12690 from durrantm/minor_README_change
Clarify that visiting http://localhost:3000 should be done in a browser. [ci skip]
2013-10-29 08:28:43 -07:00
Michael Durrant
d963b488be Clarify that visiting http://localhost:3000 should be done in a browser. 2013-10-29 10:43:30 -04:00
Rafael Mendonça França
94b8578995 Merge pull request #12688 from simi/patch-1
Update testing.rake with more accurate description of test task.
2013-10-29 06:58:45 -07:00
Josef Šimánek
e390fb05f0 Update testing.rake with more accurate description of test task.
According to #5ecd12 change.

[ci skip]
2013-10-29 14:54:33 +01:00
Andrey Samsonov
fb6f02c521 Minor doc fix of ActiveModel::Naming.
- qoute example line's result when it kind of String
- right ("singular_route_key") method in example
2013-10-29 15:23:03 +04:00
Xavier Noria
7edaecc475 Revert "add active model basics wip to guides/documents.yaml"
Reason: WIP guides are not in the index because they are partial
work pushed to the repo. Either there is someone working on them
or else the work was interrupted.

Guides are added to the index page when they are finished, the
author considers the draft to be complete, someone reviews them,
and overall they are considered to be good for users to read.

This reverts commit eefc03a8069bddfe31751c4bd4fb1804e7f33c2c.
2013-10-29 09:31:53 +01:00
Yves Senn
cd3a8fecf1 Merge pull request #10664 from aderyabin/docpatch
Fix doc in Postgres database creation [ci skip]
2013-10-29 01:28:02 -07:00
David Heinemeier Hansson
ab177d8cbe Fix broken delete_all test, which will now be failing since #delete_all is broken 2013-10-28 21:48:02 -07:00
David Heinemeier Hansson
e562ddedba Add failing test for preloading with a polymorphic association and using the existential predicate 2013-10-28 21:26:03 -07:00
Jeremy Kemper
6935075c8f Remove confusing generated-code commentary 2013-10-28 17:15:59 -07:00
Aaron Patterson
f5ef5ed3d5 fix template Gemfiles 2013-10-28 17:10:00 -07:00
Aaron Patterson
faa1b82bf2 always call set_default_accessors from create_root 2013-10-28 16:55:31 -07:00
Rafael Mendonça França
f18cf8e488 Merge pull request #11785 from grosser/grosser/file-unless-exist
support :unless_exist for FileCache

Conflicts:
	activesupport/CHANGELOG.md
	activesupport/test/caching_test.rb
2013-10-28 19:09:22 -02:00
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