Permalink
Commits on Aug 6, 2013
  1. Merge pull request #11771 from atambo/jruby_assert_distance_of_time_i…

    …n_words
    
    Remove privatizing of Fixnum#/ from assert_distance_of_time_in_words
    rafaelfranca committed Aug 6, 2013
  2. Remove privatizing of Fixnum#/ from assert_distance_of_time_in_words

    MRI reimplemented Date in C so it doesn't hit this division anymore
    while JRuby still uses the old stdlib implementation of Date so
    it will always hit this.
    
    With this change the actionview date_helper_test.rb tests should pass on JRuby.
    committed Aug 6, 2013
  3. Merge pull request #11743 from gaurish/tmp-magic

    [Jruby] Make all tests in ActionView::TemplateDigestorTest green
    guilleiguaran committed Aug 6, 2013
Commits on Aug 5, 2013
  1. config[:database] should be a string

    This change was breaking the Railties tests. See
    https://travis-ci.org/rails/rails/jobs/9865969
    rafaelfranca committed Aug 5, 2013
  2. Remove deprecated branch on the scope method.

    The deprecation message was removed on 50cbc03 but the code was not.
    rafaelfranca committed Aug 5, 2013
  3. Use the right instrumentation name

    The pattern is event.component
    
    Closes #11769
    
    Conflicts:
    	railties/CHANGELOG.md
    rafaelfranca committed Aug 5, 2013
  4. Merge pull request #11767 from kassio/master-load-fixtures-from-linke…

    …d-folder
    
    Load fixtures from linked folders[master]
    rafaelfranca committed Aug 5, 2013
  5. Merge pull request #11666 from prathamesh-sonpatki/doc-fix

    Removed confusing statement about adding route for show action in getting started guide [ci skip]
    fxn committed Aug 5, 2013
  6. Merge pull request #11762 from peterkovacs/patch-2

    Free result_metadata directly instead of freeing 2nd, redundant call.
    carlosantoniodasilva committed Aug 5, 2013
  7. Merge pull request #11763 from schneems/schneems/create-sqlite3db

    Create sqlite3 directory if not present
    josevalim committed Aug 5, 2013
  8. Create sqlite3 directory if not present

    If the `db/` directory is not present on a remote machine it will blow up in unexpected ways with error messages that do not indicate there is a missing directory:
    
    ```
    SQLite3::CantOpenException: unable to open database file
    ```
    
    This PR checks to see if a directory exists for the sqlite3 file and if not creates it for you.
    
    This PR is an alternative to #11692 as suggested by @josevalim
    schneems committed Aug 5, 2013
  9. Removed confusing statements about routes in getting started guide [c…

    …i skip]
    
    - routes for CRUD already exists as `resources :posts` is in
      `config/routes.rb`
    - So we don't have to add any new route in the `config/routes.rb`
    - As per #11644, the adding of routes which are already there confuses user, so here its
      changed to referring output of `rake routes`
    prathamesh-sonpatki committed Jul 30, 2013
  10. Free result_metadata directly instead of freeing 2nd, redundant call.

    `result_metadata` returns a new object each time it is called, so calling `result_metadata.free` is essentially a noop.  Instead call `free` directly on the metadata when we're done with it.
    peterkovacs committed Aug 5, 2013
  11. getting started guide: pass the resource to the URL helper [ci skip]

    Passing the actual ID is not idiomatic.
    fxn committed Aug 5, 2013
  12. Merge pull request #11760 from rahul100885/master

    Added data for permit array into scalar value
    
    [ci skip]
    rafaelfranca committed Aug 5, 2013
  13. Merge pull request #11757 from ryog/fix_document_active_model_errors

    Fix: documentation for ActiveModel::Errors [ci skip]
    rafaelfranca committed Aug 5, 2013
Commits on Aug 4, 2013
  1. Add tmp dir in actionview/test/

    Missing tmp directory will cause the test to fail on JRuby. will commit
    adds tmp directory & 22 TemplateDigestorTests which were failing before
    are now green.
    
    Further Discussion on this can be seen at #11743
    gaurish committed Aug 4, 2013
  2. Merge pull request #11751 from rmm5t/assert_dom_equal-message

    Pass assert_dom_equal message arg to underlying assertion
    rafaelfranca committed Aug 4, 2013
  3. Pass assert_dom_equal message arg to underlying assertion

    #assert_dom_equal and #assert_dom_not_equal both take a "failure"
    message argument, but this argument was not utilized.
    rmm5t committed Aug 4, 2013
  4. Add CHANGELOG entry for #11665

    [ci skip]
    rafaelfranca committed Aug 4, 2013
  5. Merge pull request #11665 from mshytikov/fix-config-log_level

    Rails.logger should have level specified by config.log_level.
    rafaelfranca committed Aug 4, 2013
  6. Merge pull request #11677 from jaggederest/master

    update guide to reflect default HMAC SHA1 in MessageVerifier used in SignedCookieStore
    rafaelfranca committed Aug 4, 2013
  7. Merge pull request #11693 from egilburg/minor_relation_refactor

    Minor optimization and code cleanup in query_methods.rb
    rafaelfranca committed Aug 4, 2013
  8. Merge pull request #11749 from Alamoz/getting_started_guide

    Added to 'Security' section in 'Getting Started with Rails' guide, including reference to 'Ruby on Rails Security Guide'.
    rafaelfranca committed Aug 4, 2013
  9. Merge pull request #11737 from tkhr/fix-document-about-on-validation-…

    …helpers
    
    Fix active_record_validations.md document, `:save` for `on:` validation helper was never available
    rafaelfranca committed Aug 4, 2013
  10. Fix active_record_validations.md document, `:save` for `on:` validati…

    …on helper was never available
    
    According to the guide, ":save" value for the "on:" validation helper
    was available like below
    
        validates :name, presence: true, on: :save
    
    but this was never available according to the implementation of the
    valid? method, which is below
    
        # Runs all the validations within the specified context. Returns
    +true+ if
        # no errors are found, +false+ otherwise.
        #
        # If the argument is +false+ (default is +nil+), the context is set
    to <tt>:create</tt> if
        # <tt>new_record?</tt> is +true+, and to <tt>:update</tt> if it is
    not.
        #
        # Validations with no <tt>:on</tt> option will run no matter the
    context. Validations with
        # some <tt>:on</tt> option will only run in the specified context.
        def valid?(context = nil)
          context ||= (new_record? ? :create : :update)
          output = super(context)
          errors.empty? && output
        end
    
    So the documentation was always wrong since the PR proposed by
    @neerajdotname  ( #10287 ) was rejected.
    take committed Aug 3, 2013
  11. Added to 'Security' section; especially reference to 'Ruby on Rails S…

    …ecurity Guide'. [ci skip]
    Adrien Lamothe committed Aug 4, 2013
  12. No need to use blocks here

    pixeltrix committed Aug 4, 2013
  13. Fix unused variable warning

    We need to call `in_time_zone` to test that it isn't modifying the receiver
    but since the variable isn't used it raises a warning so add an assertion
    to make Ruby think it's being used.
    pixeltrix committed Aug 4, 2013
  14. Remove "Using Action View outside of Rails" section from AV overview …

    …guide
    
    The section was clearly wrong and was just an example about how to use ActiveSupport helpers in Rack/Sinatra
    guilleiguaran committed Aug 4, 2013
  15. ✂️

    [ci skip]
    rafaelfranca committed Aug 4, 2013