Permalink
Switch branches/tags
Commits on Jan 8, 2015
  1. Merge pull request #18410 from seuros/ripfilter

    remove *_filter
    rafaelfranca committed Jan 8, 2015
  2. Merge pull request #18404 from claudiob/rebase-14549

    Add test case and documentation for skip_before_filter.
    rafaelfranca committed Jan 8, 2015
  3. Fix the example (for realz)

    dhh committed Jan 8, 2015
  4. Fix the example

    dhh committed Jan 8, 2015
  5. Merge pull request #18334 from simi/prepend-false-for-protect-from-fo…

    …rgery
    
    Add prepend option to protect_from_forgery.
    dhh committed Jan 8, 2015
  6. Merge pull request #18371 from brainopia/remove_hide_actions

    Remove ActionController::HideActions (closes #18336)
    dhh committed Jan 8, 2015
  7. Add test/doc for :if/:except in skip_before_action

    The new test/docs further explain the conflicts that can happen when
    mixing `:if`/`:unless` options with `:only`/`:except` options in
    `skip_before_action`.
    
    The gist is that "positive" filters always have priority over negative
    ones.
    
    The previous commit already showed that `:only` has priority over `:if`.
    
    This commit shows that `:if` has priority over `:except`.
    
    For instance, the following snippets are equivalent:
    
    ```ruby
    skip_before_action :some_callback, if: -> { condition }, except: action
    ```
    
    ```ruby
    skip_before_action :some_callback, if: -> { condition }
    ```
    claudiob committed Jan 8, 2015
  8. Add test case and documentation for skip_before_filter.

    Test case for using skip_before_filter with the options :only and :if
    both present. In this case, the :if option will be ignored and :only
    will be executed.
    
    Closes #14549 (the commit was cherry-picked from there).
    laurocaetano committed with claudiob Apr 1, 2014
  9. Merge pull request #18403 from georgeclaghorn/enqueued-email-assertions

    Enqueued email assertions
    dhh committed Jan 8, 2015
  10. Merge pull request #18397 from georgeclaghorn/enhance-job-assertions

    Add :only option to assert_enqueued_jobs
    dhh committed Jan 8, 2015
  11. Add :only option to assert_enqueued_jobs

    With the option, assert_enqueued_jobs will check the number of times a specific kind of job is enqueued.
    georgeclaghorn committed Jan 8, 2015
Commits on Jan 7, 2015
  1. Merge pull request #16640 from mfazekas/fix_loop_in_changed_for_autosave

    Fix potenital infinite recursion in changed_for_autosave?
    chancancode committed Jan 7, 2015
  2. Merge pull request #18377 from brainopia/custom_connection_with_count

    Fix count on a separate connection
    sgrif committed Jan 7, 2015
  3. Fix count on a separate connection (fixes #18359)

    Previosly count and other AR calculations would convert
    column_name_for_operation to sql on a default Arel::Table.engine
    (AR::Base) connection. That could lead to trouble if current
    model has a connection to a different adapter or Base connection
    is inaccessible.
    brainopia committed Jan 7, 2015
  4. Merge pull request #18378 from shunsukeaida/avoid_orm_being_humanized…

    …_in_generator_help_message
    
    Overwrite descriptions generated by Generators::Base to respect acronym.
    carlosantoniodasilva committed Jan 7, 2015
Commits on Jan 6, 2015
  1. Merge pull request #18074 from caike/master

    Add _mailer suffix to generated file names.
    rafaelfranca committed Jan 6, 2015
  2. Use Ruby's #include? to avoid relying on AS extension

    The build has failed when running the date/time ext tests in isolation
    due to the missing extension, so better than adding a require is using
    just Ruby in this case.
    
    https://travis-ci.org/rails/rails/jobs/46107954#L1077
    carlosantoniodasilva committed Jan 6, 2015
  3. Merge pull request #18368 from kuldeepaggarwal/fix-attribute-scope

    fix `attribute` method scoping(i.e. private)
    carlosantoniodasilva committed Jan 6, 2015
  4. Merge pull request #18370 from LindseyB/patch-1

    Changing sets -> set [ci-skip]
    guilleiguaran committed Jan 6, 2015
  5. Changing sets -> set

    Updating some minor grammar issue.
    LindseyB committed Jan 6, 2015
  6. Merge pull request #18335 from georgeclaghorn/day-gymnastics

    Add #weekend?, #next_weekday, and #prev_weekday methods to Date, Time, and DateTime
    dhh committed Jan 6, 2015
  7. fix `attribute` method scoping(i.e. private)

    ref #52f641264b1325a4c2bdce7971b14524bd4905f1
    kuldeepaggarwal committed Jan 6, 2015
  8. Add mailer suffix to generated files and classes

    Following the same naming convention used in
    controllers and jobs.
    caike committed Dec 17, 2014
  9. Merge pull request #18366 from codeodor/patch-1

    Add log_level options to configuration guide
    rafaelfranca committed Jan 6, 2015
  10. Merge pull request #18362 from georgemillo/attribute

    replacing 'attribute' method with an alias
    rafaelfranca committed Jan 6, 2015