Skip to content
This repository has been archived by the owner on Jan 6, 2019. It is now read-only.

Merge Develop into Staging #16

Merged
merged 88 commits into from
Aug 22, 2016
Merged

Merge Develop into Staging #16

merged 88 commits into from
Aug 22, 2016

Conversation

gottsohn
Copy link
Contributor

No description provided.

@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 271c1b8 on develop into * on staging*.

tbaraza and others added 10 commits August 17, 2016 15:04
…ela/panda into chore/deploy-initial-build-to-heroku

* 'chore/deploy-initial-build-to-heroku' of github.com:andela/panda: (62 commits)
  Add PhantomJS as a browser [Fixes #128140743]
  Add html-webpack-plugin [Fixes #128140743]
  Update react [Fixes #128140743]
  Change body [Fixes #128140743]
  [Feature #121926681] remove circle.yml file
  [Feature #121926681] update karma config file
  [Feature #121926681] restructure test files
  Revert "[Feature #121926681] restructure and rename test folder"
  [Feature #121926681] add test folder
  Revert "[Feature #121926681] remove spec file"
  [Chore #121926801] change circleci  badge style
  [Chore #121926801] modify README
  Revert "[Chore #121926801] add coverage badge to README"
  Revert "Revert "[Feature #121926681] remove spec file""
  [Chore #121926801] add coverage badge to README
  Revert "[Feature #121926681] remove spec file"
  [Feature #121926681] change to shield style
  [Feature #121926681] update README with coverage badges
  [Feature #121926681] remove spec file
  Add no-console plugin to eslint
  ...
…nitial-build-to-heroku

* 'develop' of github.com:andela/panda:
  [Feature -#126028027] remove coveralls from gitignore file
  [Feature -#126028027] add repo token
  update react version [Fixes #126028027]
  remove ignore branch config in circle.yml file [Chore #126028027]
  [Feature #126028027] fix ignore config
  [Feature #126028027] add deployment configuration" git push origin ft-\#126028027-CircleCI-Deployment-config
  [Feature #126028027] add circle.yml file
  [Feature #126028027] add procfile
[Chore #128140743] Deploy initial build to heroku
@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 3ec239d on develop into * on staging*.

@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 2da681f on develop into * on staging*.

@gottsohn gottsohn merged commit 186b17f into staging Aug 22, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants