Skip to content
Commits on Jan 8, 2015
  1. @rafaelfranca

    Merge pull request #18410 from seuros/ripfilter

    rafaelfranca committed Jan 8, 2015
    remove *_filter
  2. @seuros
  3. @rafaelfranca

    Merge pull request #18404 from claudiob/rebase-14549

    rafaelfranca committed Jan 8, 2015
    Add test case and documentation for skip_before_filter.
  4. @dhh

    Fix the example (for realz)

    dhh committed Jan 8, 2015
  5. @dhh

    Fix the example

    dhh committed Jan 8, 2015
  6. @dhh

    Merge pull request #18334 from simi/prepend-false-for-protect-from-fo…

    dhh committed Jan 8, 2015
    …rgery
    
    Add prepend option to protect_from_forgery.
  7. @simi
  8. @dhh

    Merge pull request #18371 from brainopia/remove_hide_actions

    dhh committed Jan 8, 2015
    Remove ActionController::HideActions (closes #18336)
  9. @calebthompson @schneems
  10. @claudiob

    Add test/doc for :if/:except in skip_before_action

    claudiob committed Jan 8, 2015
    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 }
    ```
  11. @laurocaetano @claudiob

    Add test case and documentation for skip_before_filter.

    laurocaetano committed with claudiob Apr 1, 2014
    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).
  12. @dhh

    Merge pull request #18403 from georgeclaghorn/enqueued-email-assertions

    dhh committed Jan 8, 2015
    Enqueued email assertions
  13. @georgeclaghorn
  14. @georgeclaghorn
  15. @carlosantoniodasilva
  16. @dhh

    Merge pull request #18397 from georgeclaghorn/enhance-job-assertions

    dhh committed Jan 7, 2015
    Add :only option to assert_enqueued_jobs
  17. @georgeclaghorn

    Add :only option to assert_enqueued_jobs

    georgeclaghorn committed Jan 7, 2015
    With the option, assert_enqueued_jobs will check the number of times a specific kind of job is enqueued.
Commits on Jan 7, 2015
  1. @chancancode

    Merge pull request #16640 from mfazekas/fix_loop_in_changed_for_autosave

    chancancode committed Jan 7, 2015
    Fix potenital infinite recursion in changed_for_autosave?
  2. @sgrif

    Merge pull request #18377 from brainopia/custom_connection_with_count

    sgrif committed Jan 7, 2015
    Fix count on a separate connection
  3. @brainopia

    Fix count on a separate connection (fixes #18359)

    brainopia committed Jan 7, 2015
    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.
  4. @carlosantoniodasilva

    Merge pull request #18378 from shunsukeaida/avoid_orm_being_humanized…

    carlosantoniodasilva committed Jan 7, 2015
    …_in_generator_help_message
    
    Overwrite descriptions generated by Generators::Base to respect acronym.
  5. @carlosantoniodasilva
  6. @shunsukeaida
Commits on Jan 6, 2015
  1. @rafaelfranca

    Merge pull request #18074 from caike/master

    rafaelfranca committed Jan 6, 2015
    Add _mailer suffix to generated file names.
  2. @brainopia
  3. @carlosantoniodasilva

    Use Ruby's #include? to avoid relying on AS extension

    carlosantoniodasilva committed Jan 6, 2015
    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
  4. @carlosantoniodasilva

    Merge pull request #18368 from kuldeepaggarwal/fix-attribute-scope

    carlosantoniodasilva committed Jan 6, 2015
    fix `attribute` method scoping(i.e. private)
  5. @guilleiguaran

    Merge pull request #18370 from LindseyB/patch-1

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

    Changing sets -> set

    LindseyB committed Jan 6, 2015
    Updating some minor grammar issue.
  7. @dhh

    Merge pull request #18335 from georgeclaghorn/day-gymnastics

    dhh committed Jan 6, 2015
    Add #weekend?, #next_weekday, and #prev_weekday methods to Date, Time, and DateTime
  8. @kuldeepaggarwal

    fix `attribute` method scoping(i.e. private)

    kuldeepaggarwal committed Jan 6, 2015
    ref #52f641264b1325a4c2bdce7971b14524bd4905f1
  9. @caike

    Add mailer suffix to generated files and classes

    caike committed Dec 17, 2014
    Following the same naming convention used in
    controllers and jobs.
  10. @rafaelfranca

    Merge pull request #18366 from codeodor/patch-1

    rafaelfranca committed Jan 6, 2015
    Add log_level options to configuration guide
  11. @codeodor
  12. @rafaelfranca

    Merge pull request #18362 from georgemillo/attribute

    rafaelfranca committed Jan 6, 2015
    replacing 'attribute' method with an alias
Something went wrong with that request. Please try again.