This repository has been archived by the owner. It is now read-only.
Permalink
Commits on Feb 15, 2015
Commits on Feb 4, 2014
  1. Merge pull request #105 from github/project-status

    bkeepers committed Feb 4, 2014
    Update README to reflect project status
Commits on Nov 18, 2013
  1. Merge pull request #102 from sethvargo/sethvargo/filter_params

    bkeepers committed Nov 18, 2013
    Add "passphrase" to filtered parameters
Commits on Aug 21, 2013
  1. Merge pull request #97 from ejfinneran/issue-66

    bkeepers committed Aug 21, 2013
    Fix exception after changing keypair
Commits on Aug 15, 2013
  1. Merge pull request #96 from themgt/patch-1

    bkeepers committed Aug 15, 2013
    only load guard/jasmine rake tasks in dev/test environments
Commits on Apr 4, 2013
  1. Upgrade to Rails 3.2.13

    bkeepers committed Apr 4, 2013
Commits on Apr 1, 2013
  1. Merge pull request #91 from jugglingnutcase/patch-1

    bkeepers committed Apr 1, 2013
    Fix typo
Commits on Mar 2, 2013
  1. Merge pull request #89 from listrophy/db_create_before_migrate

    bkeepers committed Mar 2, 2013
    Docfix: Need to db:create before migrating
Commits on Feb 13, 2013
  1. Merge branch 'ezkl-drop-ruby-version'

    bkeepers committed Feb 13, 2013
    * ezkl-drop-ruby-version:
      Specify ruby version in the gemfile
      Ignore .ruby-version
      Remove .ruby-version
    
    Conflicts:
    	.ruby-version
    	Gemfile
  2. Ignore .ruby-version

    bkeepers committed Feb 13, 2013
  3. Update multi_json

    bkeepers committed Feb 13, 2013
  4. Merge branch 'master' into ezkl-rails-v3-2-12

    bkeepers committed Feb 13, 2013
    * master:
      Use `create_item` helper in acceptance spec
      Base64 encode data encrypted with private key
      Upgrade poltergeist and dependencies
      Remove cucumber
      Add launchy and pry for debugging
      Configure postgres on travis
      Convert public_key to a text field
      Use Postgres as the database
      Always clean db with truncation
      Move item feature to rspec
      Use database cleaner in specs
      Move key features into rpsec
      Move fixture helper into a module
      Update schema with defaults
      Add Mega article to reading section
    
    Conflicts:
    	Gemfile
    	Gemfile.lock
  5. Merge pull request #88 from github/rspec-acceptance

    bkeepers committed Feb 13, 2013
    Rewrite Cucumber features as RSpec acceptance specs
Commits on Feb 12, 2013
  1. Merge remote-tracking branch 'origin/master' into rspec-acceptance

    bkeepers committed Feb 12, 2013
    * origin/master:
      formatting
      Use base64 from forge
      Fix typo
      reverting changes to db/schema.rb
      add/delete files
      moving to forge for aes
      Add info on joining the core team
      draft of core team docs
  2. Merge pull request #87 from github/postgres

    bkeepers committed Feb 12, 2013
    Use Postgres
  3. Merge branch 'master' of github.com:github/swordfish

    bkeepers committed Feb 12, 2013
    * 'master' of github.com:github/swordfish:
      formatting
      Use base64 from forge
      Fix typo
      reverting changes to db/schema.rb
      add/delete files
      moving to forge for aes
      Add info on joining the core team
      draft of core team docs
  4. Remove cucumber

    bkeepers committed Feb 12, 2013
  5. Merge branch 'postgres' into rspec-acceptance

    bkeepers committed Feb 12, 2013
    * postgres:
      Configure postgres on travis
      Convert public_key to a text field
      Use Postgres as the database
  6. Configure postgres on travis

    bkeepers committed Feb 12, 2013
  7. Use Postgres as the database

    bkeepers committed Feb 12, 2013
  8. Always clean db with truncation

    bkeepers committed Feb 12, 2013
  9. Move item feature to rspec

    bkeepers committed Feb 12, 2013
  10. Use database cleaner in specs

    bkeepers committed Feb 12, 2013
  11. Move key features into rpsec

    bkeepers committed Feb 12, 2013
  12. Update schema with defaults

    bkeepers committed Feb 12, 2013
Commits on Jan 31, 2013
  1. Merge pull request #83 from github/no_cryptojs

    bkeepers committed Jan 31, 2013
    No CryptoJS