mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
45,777 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

45777 Commits

Author SHA1 Message Date
Zachary Scott f18552a872 Merge pull request #16384 from tomkadwill/improved_create_documentation 
[ci skip] Added +object+ and +attributes+ to create! description for rdoc
 2014-08-07 19:01:45 -07:00
David Heinemeier Hansson fbe38c9e9d Pull spring gem entry into the Gemfile template instead of gemfile_entries so it can be grouped with the other development tools 2014-08-07 16:34:27 -07:00
David Heinemeier Hansson 089661b69a Merge branch 'master' of github.com:rails/rails 2014-08-07 16:10:20 -07:00
David Heinemeier Hansson cc1de71bfa Stop using padding in the generated Gemfile -- it looks shit 2014-08-07 16:10:14 -07:00
Aaron Patterson e81453ef92 need to call super 2014-08-07 16:03:09 -07:00
Aaron Patterson 8121eefc22 add a new constructor that runs load hooks 2014-08-07 15:50:46 -07:00
Aaron Patterson 2296989826 defer running after_config hooks until after the object is allocated 2014-08-07 15:28:53 -07:00
Rafael Mendonça França 42c569e71e Merge pull request #16424 from gregors/remove_dead_code 
remove dead file_watcher code
 2014-08-07 19:01:46 -03:00
Gregory Ostermayr 6c9669e8f0 remove dead file_watcher code 2014-08-07 16:19:20 -04:00
Aaron Patterson 399f5f6346 use the uri parser so that newer version of Ruby work 2014-08-07 12:10:31 -07:00
Aaron Patterson 69adfc9de6 Merge pull request #16421 from tsukasaoishi/prevant_manycall_showtables 
Tables existence check query is executed in large quantities
 2014-08-07 09:40:53 -07:00
tsukasaoishi 4e83815ce9 change to empty? from blank? 2014-08-08 01:03:09 +09:00
Yves Senn 12cf864abb Merge pull request #16422 from tgxworld/fix_spelling 
Closes #16422
 2014-08-07 17:27:18 +02:00
Guo Xiang Tan 4c30b4fc21 Fix spelling. 2014-08-07 17:26:56 +02:00
tsukasaoishi 8aead812ba Tables existence check query is executed in large quantities 
When Rails starts, tables existence check query is executed
number of models.
In case of mysql,

    SHOW TABLES LIKE 'table1';
    SHOW TABLES LIKE 'table2';
    SHOW TABLES LIKE 'table3';
    ...
    SHOW TABLES LIKE 'table999';

Add process to get the names of all tables by one query.
 2014-08-07 22:41:23 +09:00
Carlos Antonio da Silva 9a0e0594ab Fix typo [ci skip] 2014-08-07 09:17:23 -03:00
Santiago Pastorino e2689d1dad Merge pull request #16412 from yevhene/master 
Fix in has_secure_password for passwords containing only spaces.
 2014-08-07 09:13:24 -03:00
Santiago Pastorino f0fdba8b1d Merge pull request #16419 from tgxworld/remove_legacy_code 
Remove ActionController::RaiseActionExceptions.
 2014-08-07 09:10:30 -03:00
Guo Xiang Tan 14508aec70 Remove ActionController::RaiseActionExceptions. 
The latest modification to the code was done in https://github.com/rails/rails/commit/5e3517ea. In Rails 3.2,
`ActionController#rescue_action` was deprecated and `rescue_action_without_handler` is no longer being used.
 2014-08-07 17:43:36 +08:00
Tom Kadwill 38b6b5db58 [ci skip] Updated create! documentation description and added +attributes+ for rdoc 2014-08-07 08:54:03 +01:00
Rafael Mendonça França e6e81f856e Define id_was to get the previous value of the primary key 
Currently when we call id_was and we have a custom primary key name
Active Record will return the current value of the primary key. This
make impossible to correctly do an update operation if you change the
id.

Fixes #16413
 2014-08-06 23:46:31 -03:00
Rafael Mendonça França ee255794b3 Test using turbolinks master 
See
153f1b0f04
 2014-08-06 22:48:22 -03:00
Rafael Mendonça França ca9736e78c Fix DateTime comparison with DateTime::Infinity object 
Fixes #16406
 2014-08-06 22:43:37 -03:00
Aaron Patterson d25fe31c40 lazily instantiate application subclasses 
this means we can meaningfully override methods in the subclass
 2014-08-06 18:27:16 -07:00
Aaron Patterson 2090615d39 refactor Redirecting so we do not need a controller instance 2014-08-06 14:17:57 -07:00
Yevhene Shemet f8dcb365df Allow password to contain spaces only. 2014-08-06 22:11:06 +03:00
Akira Matsuda 3dfcae6afa defined? should actually work in current implementation 
So this trick is not needed to be documented anymore.
 2014-08-07 01:59:58 +09:00
Santiago Pastorino d5be08347f Merge pull request #16402 from bogdan/select_with_empty_block 
Fixed #select form builder helper to support block without html output
 2014-08-06 10:48:52 -03:00
Yves Senn a819211984 Merge pull request #16359 from skanev/after-bundle-in-rails-templates 
Add an after_bundle callback in Rails templates

Conflicts:
	railties/CHANGELOG.md
 2014-08-06 08:49:00 +02:00
Yves Senn ec54acd1e0 Merge pull request #16316 from rails/senny/purge_schema_maintenance 
purge database before loading schema, take 2
 2014-08-06 08:26:13 +02:00
Yves Senn f15cef67f7 schema rake tasks are specific about the configuration to act on. 
The rake tasks and the `DatabaseTakss` adapter classes used to
assume a configuration at some places. This forced the rake
tasks to establish a specific connection before calling into
`load_schema`.

After #15394 this started to cause issues because it could
`purge` the wrong database before loading the schema.
 2014-08-06 08:25:18 +02:00
Yves Senn 53dba73dc1 Revert "Revert "Merge pull request #15394 from morgoth/fix-automatic-maintaining-test-schema-for-sql-format"" 
This reverts commit 5c87b5c524.
 2014-08-06 08:25:18 +02:00
Aaron Patterson acb371ca3f call the routes method on engines 
if we access the instance, we can free up lots of codes
 2014-08-05 16:50:50 -07:00
Aaron Patterson 9a36fac810 a rails application should be an engine subclass 2014-08-05 16:30:08 -07:00
Aaron Patterson 70673759a0 no reason to lazily instantiate the routes 
especially if you're just going to add a call two lines down that
populates the cache. common.
 2014-08-05 16:28:55 -07:00
Jeremy Kemper b89c5a043e Merge pull request #16364 from arthurnn/make_transaction_one_class 
Clarify Transaction responsibilities by breaking unneeded inheritance hierarchy.
 2014-08-05 10:05:10 -07:00
Aaron Patterson ed180eea48 just assign the instance variables on the test 2014-08-05 09:51:47 -07:00
Guillermo Iguaran ab54ec7248 We don't need parenthesis for this 2014-08-05 11:51:12 -05:00
Guillermo Iguaran 7583aa2f6b Merge pull request #16405 from arthurnn/fix_digest_etag_test 
Fix digest ETAG test.
 2014-08-05 11:43:13 -05:00
Arthur Neves a7060a6e21
Fix digest ETAG test. 
After
12528d4567
ETag will include a `W/` before the digest.
 2014-08-05 12:40:54 -04:00
Stefan Kanev c294e91d00 Add after_bundle to the release notes and upgrade guide 2014-08-05 19:38:48 +03:00
Carlos Antonio da Silva 82f6061fbe Merge pull request #16404 from bogdan/move-create-with-bang 
Moved #create! method from Validations to Persistence module
 2014-08-05 13:34:57 -03:00
Bogdan Gusiev 977a489cfa Moved #create! method from Validations to Persistence module 2014-08-05 18:36:29 +03:00
Arthur Neves 8298d3adb7
Cleanup Transaction inheritance. 
Transaction class doesnt need to encapsulate the transaction state using
inheritance.
This removes all Transaction subclasses, and let the Transaction object
controls different actions based on its own state. Basically the only
actions would behave differently are `being`,`commit`,`rollback` as they
could act in a savepoint or in a real transaction.
 2014-08-05 11:13:26 -04:00
Bogdan Gusiev 7a0c2ba48b Fixed #select form builder helper to support block with html output 2014-08-05 17:23:00 +03:00
Carlos Antonio da Silva ab2a35878b Fix AS docs / changelog with wrong method [ci skip] 2014-08-05 10:19:00 -03:00
José Valim e5e4d08450 Bring back the helpers tests 
Also keep the hook as other tools may rely on it,
we just don't do anything by default on Rails.
 2014-08-05 14:04:30 +02:00
Carlos Antonio da Silva d44702ee45 Remove unused text? predicate method and delegation 
The method has been removed in 09206716f8
(PR #16074), but the delegation was apparently missed, and one instance
of the method was added back with the addition of OID::Xml in
336be2bdf7 (PR #16072), so we can safely
rm both.
 2014-08-05 08:22:12 -03:00
Carlos Antonio da Silva 28f6b895c6 Call public methods rather than class_eval'ing 2014-08-05 08:18:39 -03:00
Aaron Patterson 3300fdedc7 avoid testing only_path 
we know that this call only wants the path returned, so lets call a
method that returns the path.
 2014-08-04 18:20:07 -07:00