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

Update id service with master #2539

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

Update id service with master #2539

wants to merge 2 commits into from

Conversation

brianhall
Copy link

This PR uses the instructions from the README to update the bundled id service to the current master branch from that service.

This was created as part of the discussion in: https://github.com/mozilla/thimble.mozilla.org/issues/2533

a576fbdc Merge pull request #442 from kritisingh1/favicon
00464ab6 minor changes
b12bc398 added favicon
b912dcc2 Merge pull request #439 from mozilla/appveyor
47ddc9b4 Merge branch 'master' into appveyor
e10b1a1d Fix #440 - Update Node (#441)
f7ae1a64 Update appveyor.yml
a7d01252 Update .travis.yml
d690cdbf Update .travis.yml
821a103b trailing newline
5316cb78 gotta use trusty!
36e37faa such break, very fragile
e210550b oops
6419b8a4 fix travis + postgres
4a04ba18 Add appveyor.yml, test with PostgreSQL 9.6 on travis
bd8b9ced Merge pull request #438 from mozilla/node6
f095c77c Create package.json
207d4553 Merge pull request #430 from mozilla/readme-fix
2c9168a4 Update package.json
4e8d587d Update .travis.yml
1015575d Merge pull request #437 from mozilla/dispatch-protection
6f9b3219 oops
ffd9db6f wrap dispatches so that they only send once the dispatcher is free
4c0f2fa3 Merge pull request #435 from mozilla/button-updates
af42aaf5 Removed test ref attribute
9c66de99 Disabled the sign up and log in buttons after they are clicked, re-enables when appropriate.
d46ad71f Merge pull request #433 from mozilla/image-fixes
4633232e Updated images
d38da4bc Merge pull request #432 from mozilla/logo-updates
c846f860 Updated alt text for the mozilla logo in the header
0456bb20 Changed the logo to be just mozilla
3d1cf07b Updated mozilla logo, added Thimble to header, changed colors.
602f3b7d Merge pull request #428 from ryanwarsaw/copy-env-before-install
c22e0345 Revise code formatting based on review suggestions
833dd8e7 Don't copy env if NODE_ENV variable is defined
c93ed4d5 Merge pull request #429 from ryanwarsaw/remove-new-relic
201452b4 Add pre-install script to copy env before install
a6ad53af Fix oauth doc link
b4f42a76 Redundant dependency: newrelic

git-subtree-dir: services/id.webmaker.org
git-subtree-split: a576fbdcb8d080616eab210c209704fbfb79ff5f
@gideonthomas
Copy link
Contributor

@brianhall unfortunately I still see the errors you mentioned seeing in the issue comments. Would you be able to submit a PR against the https://github.com/mozilla/id.webmaker.org repository with your upgrade to the babel-loader so that we can land it there? Then, once we land that PR on id.webmaker.org's master branch, you probably would need to checkout a new branch on Thimble from master, repeat the steps to update the id service, and open a new PR on Thimble.

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.

2 participants