Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ChefSocial/webapp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ak_setup
Choose a base ref
...
head repository: ChefSocial/webapp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 14 commits
  • 7 files changed
  • 2 contributors

Commits on Aug 12, 2016

  1. added puma and capistrano integration for deployment to aws

    Vikrant Kamble committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    29eb316 View commit details
    Browse the repository at this point in the history

  2. added .env.production symlink to cap deploy

    Vikrant Kamble committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    031753b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:ChefSocial/webapp

    @akashdevaraju
    akashdevaraju committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    1802cb6 View commit details
    Browse the repository at this point in the history

  4. added config.assets.digest=true in env/production.rb

    Vikrant Kamble committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    c09f4f5 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of github.com:ChefSocial/webapp into vk_capistr… 

    …ano_deploy_aws
    Vikrant Kamble committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    4cdc2b4 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'ak_setup'

    @akashdevaraju
    akashdevaraju committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    2f96799 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of github.com:ChefSocial/webapp

    @akashdevaraju
    akashdevaraju committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    a8ae87f View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2016

  1. capistrano doctor integration for troubleshooting net-ssh

    Vikrant Kamble committed Aug 13, 2016
    Configuration menu
    Copy the full SHA
    795eec9 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2016

  1. Merge branch 'ak_setup' 

    Conflicts:
	Gemfile.lock
    @akashdevaraju
    akashdevaraju committed Aug 14, 2016
    Configuration menu
    Copy the full SHA
    9aa0afa View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2016

  1. Merge branch 'ak_setup'

    @akashdevaraju
    akashdevaraju committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    a19a4f0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'ak_setup'

    @akashdevaraju
    akashdevaraju committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    eeb9a6d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ak_setup'

    @akashdevaraju
    akashdevaraju committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    12082a8 View commit details
    Browse the repository at this point in the history

  4. [Deploy] Added cloudinary.yml file update

    @akashdevaraju
    akashdevaraju committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    f46afb5 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'ak_setup'

    @akashdevaraju
    akashdevaraju committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    838cace View commit details
    Browse the repository at this point in the history
Loading