Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hook up asset_host in ActionMailer #2

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Hook up asset_host in ActionMailer #2

wants to merge 10 commits into from

Commits on Apr 21, 2011

  1. Revert "Revert "Ported to aws-s3 gem."" 

    This reverts commit f04c9ea.

Conflicts:

	Gemfile.lock
    Kliment Mamykin committed Apr 21, 2011
    Configuration menu
    Copy the full SHA
    60d0e04 View commit details
    Browse the repository at this point in the history

  2. Updated to use aws-s3 in upload_file 

    Also setting all awailable S3 headers if configured (setting :expires was added)
    Kliment Mamykin committed Apr 21, 2011
    Configuration menu
    Copy the full SHA
    f0001c3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into aws-s3 

    Conflicts:
	lib/jammit/s3_uploader.rb
    Kliment Mamykin committed Apr 21, 2011
    Configuration menu
    Copy the full SHA
    1b6de52 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2011

  1. Merge branch 'master' into aws-s3

    Kliment Mamykin committed May 25, 2011
    Configuration menu
    Copy the full SHA
    2ae21f4 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2011

  1. Updating to not upload files if already uploaded.

    @pvertenten
    pvertenten committed Oct 11, 2011
    Configuration menu
    Copy the full SHA
    8ee148b View commit details
    Browse the repository at this point in the history

  2. Adding some additional logging.

    @pvertenten
    pvertenten committed Oct 11, 2011
    Configuration menu
    Copy the full SHA
    5de4d8c View commit details
    Browse the repository at this point in the history

  3. Trying to prevent streaming from hanging.

    @pvertenten
    pvertenten committed Oct 11, 2011
    Configuration menu
    Copy the full SHA
    353e0c5 View commit details
    Browse the repository at this point in the history

  4. Removing debug.

    @pvertenten
    pvertenten committed Oct 11, 2011
    Configuration menu
    Copy the full SHA
    beb5e70 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2011

  1. I imagine this modification along with removing the custom config.act… 

    …ion_mailer.asset_host in staging.rb/production.rb should fix the issue. Not sure how to test in development, though.
    Jonathan B committed Oct 12, 2011
    Configuration menu
    Copy the full SHA
    6375bda View commit details
    Browse the repository at this point in the history

  2. copy/paste typo

    Jonathan B committed Oct 12, 2011
    Configuration menu
    Copy the full SHA
    26b97b2 View commit details
    Browse the repository at this point in the history