Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | simplifies a regexp | Xavier Noria | 2012-08-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | We simplify two things here: First since * is greedy it is enough to go look for the rightmost ::, no need to ask the regexp engine to match the rest of the string since we are not validating anything, only capturing. The second simplification comes from using a look-ahead assertion, that allows us to have the capture in $&, thus removing the need of a group. | |||||
* | | use Hash#fetch to eliminate conditional | Aaron Patterson | 2012-08-24 | 1 | -8/+3 | |
| | | ||||||
* | | call methods on AR::Model after ClassMethods module is defined | Aaron Patterson | 2012-08-24 | 1 | -1/+2 | |
| | | ||||||
* | | Merge pull request #7342 from sobrinho/master | Rafael Mendonça França | 2012-08-24 | 6 | -5/+64 | |
|\ \ | | | | | | | Accept a symbol for `:in` option on inclusion and exclusion validators | |||||
| * | | Accept a symbol for `:in` option on inclusion and exclusion validators | Gabriel Sobrinho | 2012-08-24 | 6 | -5/+64 | |
| | | | ||||||
* | | | Merge pull request #7436 from sikachu/master-remove-active_record-session_store | José Valim | 2012-08-24 | 25 | -976/+41 | |
|\ \ \ | |/ / |/| | | Extract ActiveRecord::SessionStore from Rails | |||||
| * | | Raise more helpful error message on missing gem | Prem Sichanugrist | 2012-08-24 | 2 | -0/+26 | |
| | | | | | | | | | | | | | | | | | | Tell people to install `activerecord-session_store` gem when it's not installed instead ofraising `NameError` on missing `ActionDispatch::Session::ActiveRecordStore`. | |||||
| * | | Remove meta Sesion Migration generator | Prem Sichanugrist | 2012-08-24 | 2 | -16/+0 | |
| | | | ||||||
| * | | Update guide/release note about AR::SessionStore | Prem Sichanugrist | 2012-08-24 | 4 | -14/+6 | |
| | | | ||||||
| * | | Extract ActiveRecord::SessionStore from Rails | Prem Sichanugrist | 2012-08-24 | 18 | -947/+10 | |
|/ / | | | | | | | | | This functionality will be available from gem `active_record-session_store` instead. | |||||
* | | Merge pull request #7058 from frodsan/fix_as_random_tests | Rafael Mendonça França | 2012-08-24 | 6 | -25/+36 | |
|\ \ | | | | | | | Fix tests that depend on run order | |||||
| * | | Fix ActionMailer tests that depend on run order | Francesco Rodriguez | 2012-08-23 | 1 | -5/+9 | |
| | | | ||||||
| * | | Fix ActiveModel tests that depend on run order | Francesco Rodriguez | 2012-08-23 | 1 | -6/+4 | |
| | | | ||||||
| * | | Fix ActiveSupport tests that depend on run order | Francesco Rodriguez | 2012-08-23 | 4 | -14/+23 | |
| | | | ||||||
* | | | simplifies a regexp | Xavier Noria | 2012-08-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | The new regexp has less work to do, we anchor a fixed string at the end and need no group. | |||||
* | | | ivar will always be defined, so stop checking | Aaron Patterson | 2012-08-23 | 1 | -3/+1 | |
| | | | ||||||
* | | | mysql does not build on Ruby 2.0.0 at the moment | Aaron Patterson | 2012-08-23 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #7434 from frodsan/select_list_arguments | Aaron Patterson | 2012-08-23 | 2 | -11/+20 | |
|\ \ | | | | | | | Model.select takes a variable list of arguments | |||||
| * | | Model.select takes a variable list of arguments. | Isaac Sanders | 2012-08-23 | 2 | -11/+20 | |
|/ / | | | | | | | | | | | This is a cleaner version of #6916. Closes #3165. | |||||
* | | Merge pull request #7061 from davidcelis/master | Vijay Dev | 2012-08-23 | 1 | -1/+3 | |
|\ \ | | | | | | | Update the documentation for the :autosave option on belongs_to | |||||
| * | | Update the documentation for the :autosave option | David Celis | 2012-08-23 | 1 | -1/+3 | |
|/ / | | | | | | | | | | | | | | | | | | | | | I've noticed a caveat with the :autosave option biting people before. Questions arise about why they must explicitly save an associated object in their own before_save callbacks. I've updated the documentation as such to note to users that the :autosave callback occurs before any user defined callbacks. They must save the associated record themselves if altering it in their own callbacks. Signed-off-by: David Celis <david@davidcelis.com> | |||||
* | | Revert "Use join without default separator" | José Valim | 2012-08-23 | 2 | -2/+7 | |
| | | | | | | | | | | | | This reverts commit b0ab8dc0b2b0f580ffe5ac9ff57fd13152e18577 because it was removing the contents of the message when we did not have any tag. A test case is also committed. | |||||
* | | Fix failure on middleware/exceptions_test | José Valim | 2012-08-23 | 2 | -11/+5 | |
| | | | | | | | | | | | | | | The reason the test was failing was because when the test invokes `app.config`, the app is loaded and, as `eager_load` is set to true, it disables the dependency loading mechanism, so controllers that are later defined are not loaded. | |||||
* | | Update the ducumentation about the before_eager_load callback [ci skip] | Rafael Mendonça França | 2012-08-22 | 1 | -1/+1 | |
| | | ||||||
* | | before_eager_load only runs when eager_load is true | Rafael Mendonça França | 2012-08-22 | 1 | -4/+4 | |
| | | ||||||
* | | skip the memcache tests if the memcache server is not up | Aaron Patterson | 2012-08-22 | 2 | -48/+50 | |
| | | ||||||
* | | revises a brittle test in Active Support | Xavier Noria | 2012-08-22 | 2 | -12/+22 | |
| | | | | | | | | | | | | | | The revised test assumed that the default permissions of a file matched the umask of the process, but in the general case that depends also on the file system. This test was failing in the /vagrant shared folder of Rails development boxes. | |||||
* | | edit secret token template comment [ci skip] | Vijay Dev | 2012-08-23 | 1 | -1/+1 | |
| | | ||||||
* | | copy edit the time_ago_in_words helper docs | Vijay Dev | 2012-08-23 | 1 | -4/+4 | |
| | | ||||||
* | | Merge pull request #7398 from iamvery/time_ago_in_words-docs | Vijay Dev | 2012-08-22 | 1 | -0/+7 | |
|\ \ | | | | | | | Extended documentation for `time_ago_in_words` helper | |||||
| * | | Extended documentation for `time_ago_in_words` helper | Jay Hayes | 2012-08-20 | 1 | -0/+7 | |
| | | | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-08-22 | 2 | -19/+18 | |
|\ \ \ | ||||||
| * | | | giving a pause usually made for e.g. in sentences [ci skip] | Soon Van | 2012-08-21 | 1 | -15/+14 | |
| | | | | ||||||
| * | | | Revert "association_basics, updated how inverse_of works" | Rafael Mendonça França | 2012-08-20 | 1 | -3/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8cb9460437eddde6952fbebbc969203cd4d00294. Reason: #7377 was merged and it fixes this behavior. | |||||
| * | | | association_basics, updated how inverse_of works | Olli Huotari | 2012-08-20 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | Fixed bug in the example code. A bit related to rails issue in https://github.com/rails/rails/issues/3223 | |||||
| * | | | Make a doc example output in match actual output | Evan Farrar | 2012-08-15 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | Make doc output in grouped_options_for_select divider example match actual output. The options groups were in backwards order of actual. | |||||
* | | | | Merge pull request #7413 from siong1987/secret_token | Carlos Antonio da Silva | 2012-08-22 | 1 | -0/+3 | |
|\ \ \ \ | | | | | | | | | | | Remind user a good way to generate a secret code [ci skip] | |||||
| * | | | | remind user a good way to generate a secret code. | Teng Siong Ong | 2012-08-21 | 1 | -0/+3 | |
|/ / / / | ||||||
* | | | | Merge pull request #6606 from amatsuda/ar_relation_model_method | Rafael Mendonça França | 2012-08-21 | 2 | -0/+6 | |
|\ \ \ \ | | | | | | | | | | | AR::Relation#model would be a better API than AR::Relation#klass | |||||
| * | | | | AR::Relation#model would be a better API than AR::Relation#klass | Akira Matsuda | 2012-06-03 | 2 | -0/+6 | |
| | | | | | ||||||
* | | | | | Add CHANGELOG entry for #3578 [ci skip] | Rafael Mendonça França | 2012-08-21 | 2 | -0/+10 | |
| | | | | | ||||||
* | | | | | Merge pull request #3578 from amatsuda/remove_j_alias_for_json_escape | Rafael Mendonça França | 2012-08-21 | 1 | -7/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove j alias for ERB::Util.json_escape | |||||
| * | | | | | Remove j alias for ERB::Util.json_escape | Akira Matsuda | 2011-11-09 | 1 | -7/+0 | |
| | | | | | | ||||||
* | | | | | | Remove app building setup/teardown for remote ip railtie tests | Carlos Antonio da Silva | 2012-08-21 | 1 | -14/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests rely on "make_basic_app", which is a faster version that does not need to create the whole app directory structure. | |||||
* | | | | | | Set eager load option in "make_basic_app" for railties tests | Carlos Antonio da Silva | 2012-08-21 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Avoid output with config option not set when running some tests. | |||||
* | | | | | | Merge pull request #7225 from rails/eager_load | José Valim | 2012-08-21 | 33 | -109/+215 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Improve eager load on Rails | |||||
| * | | | | | | add Rack::Lock for webrick | Aaron Patterson | 2012-08-21 | 1 | -0/+9 | |
| | | | | | | | ||||||
| * | | | | | | Deprecate config.threadsafe! | José Valim | 2012-08-21 | 4 | -22/+20 | |
| | | | | | | | ||||||
| * | | | | | | Get rid of config.preload_frameworks in favor of config.eager_load_namespaces | José Valim | 2012-08-21 | 23 | -52/+80 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new option allows any Ruby namespace to be registered and set up for eager load. We are effectively exposing the structure existing in Rails since v3.0 for all developers in order to make their applications thread-safe and CoW friendly. | |||||
| * | | | | | | Make ActiveSupport::Autoload local | José Valim | 2012-08-21 | 3 | -30/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, ActiveSupport::Autoload was global and reserved for usage inside Rails. This pull request makes it local, fixes its test (they were not being run because its file was named wrongly) and make it part of Rails public API. |