Skip to content
Commits on Oct 7, 2012
  1. @rafaelfranca

    Merge pull request #7869 from Locke23rus/actionmailer_new_hash_syntax

    Update actionmailer with new hash syntax.
    
    Just to make clear we don't accept this kind of pull request because it can invalidate a lot of pull requests.
    
    I'm accepting this because Action Mailer has only two open pull requests.
    rafaelfranca committed Oct 7, 2012
  2. @Locke23rus
  3. @fxn
  4. @fxn

    Merge pull request #7650 from kennyj/fix_warning_20120915

    Fix warning: circular require considered harmful.
    fxn committed Oct 7, 2012
  5. @fxn
  6. @jeremy
  7. @jeremy

    Tag the blank log line between dev requests so it's easier to filter …

    …out entire requests with grep -v without leaving a stray newline behind. Example:
    
      # Tag asset requests so it's easy to filter them from dev logs
      config.log_tags = [
        -> request { :assets if request.path.starts_with?(config.assets.prefix) },
        -> request { request.uuid }
      ]
    
      # Watch the logs, ignoring asset requests
      $ tail -100f log/development.log | grep -v assets
    jeremy committed Oct 6, 2012
  8. @rafaelfranca
  9. @jeremy

    Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrop…

    …hes a few times, so fix up the test to work with however it chooses to escape.
    jeremy committed Oct 6, 2012
  10. @jeremy

    Ruby 2 compat. Hash[] now raises on bad elements rather than ignoring…

    … them. No sense over-testing this MRI-specific behavior. See ruby/ruby@8d6add9
    jeremy committed Oct 6, 2012
  11. @rafaelfranca

    Fix nodoc comment

    rafaelfranca committed Oct 7, 2012
  12. @rafaelfranca
  13. @rafaelfranca

    We don't need to check blank? here.

    Also the blank? check introduced a bug.
    
    $ rails generate model Foo blank:boolean
    
    form_for(Foo.new(:blank => true)) => ArgumentError, "First argument in form cannot contain nil or be empty"
    rafaelfranca committed Oct 6, 2012
  14. @rafaelfranca

    Update some code styles.

    * Uses the Ruby 1.9 hash syntax
    * Avoid escaping " inside string using the %{} syntax
    rafaelfranca committed Oct 6, 2012
  15. @fxn

    Merge pull request #6475 from joefiorini/responsive-guides

    Responsive guides
    fxn committed Oct 6, 2012
Commits on Oct 6, 2012
  1. @rafaelfranca

    Merge pull request #7864 from teleological/link_to_remote_master

    Accept :remote as symbol in link_to options
    rafaelfranca committed Oct 6, 2012
  2. @rafaelfranca

    Remove unneeded require

    rafaelfranca committed Oct 6, 2012
  3. @rafaelfranca
  4. @teleological

    Accept :remote as symbol in link_to options

    Accept either :remote or 'remote' in both the html_options and
    (url_)options hash arguments to link_to.
    teleological committed Oct 6, 2012
  5. @joefiorini
  6. @joefiorini
  7. @rafaelfranca

    Merge pull request #7848 from senny/3415_assert_template_has_nil_vari…

    …able
    
    can't pass :locals to #assert_template without a view test case (#3415)
    rafaelfranca committed Oct 6, 2012
  8. @senny

    can't pass :locals to #assert_template without a view test case. Closes

    #3415
    
    the documentation on #assert_template states that the :locals option is
    only available in view test cases:
    
        # In a view test case, you can also assert that specific locals are passed
        # to partials:
    
    I added a warning when it's passed in an inapropriate context to prevent
    a NoMethodError.
    senny committed Oct 4, 2012
  9. @spastorino

    Merge pull request #7862 from frodsan/rename_private_method

    rename private method to avoid overriding
    spastorino committed Oct 5, 2012
  10. rename private method to avoid overriding

    Francesco Rodriguez committed Oct 6, 2012
  11. @rafaelfranca

    Merge pull request #7850 from senny/5920_postgres_adapter_table_with_…

    …capital_letters
    
    postgres, quote table names when fetching the primary key (#5920)
    rafaelfranca committed Oct 5, 2012
  12. @rafaelfranca
  13. @rafaelfranca

    Merge pull request #7861 from frodsan/test_backtrace

    use Rails backtrace in tests
    rafaelfranca committed Oct 5, 2012
  14. use Rails backtrace in tests

    Francesco Rodriguez committed Oct 5, 2012
  15. bump minitest version ~> 4.1.0

    Francesco Rodriguez committed Oct 5, 2012
Commits on Oct 5, 2012
  1. @rafaelfranca

    Allow parameter filters to match multi-parameter attributes

    This will make easier to permit date/time attributes generated by
    helpers like date_select.
    
    [Sven Schwyn + Rafael Mendonça França]
    rafaelfranca committed Oct 5, 2012
  2. @rafaelfranca

    Merge pull request #7854 from guilleiguaran/extract-rack-cache

    Fix middleware cache tests enabling rack_cache
    rafaelfranca committed Oct 5, 2012
  3. @guilleiguaran
  4. @jeremy

    Merge pull request #7852 from rochefort/fix-example

    fix Example: Rename tools/profile_requires -> tools/profile
    jeremy committed Oct 5, 2012
  5. @rochefort
Something went wrong with that request. Please try again.