Skip to content
This repository has been archived by the owner on Sep 5, 2020. It is now read-only.

Merge develop into master #2279

Merged
merged 13 commits into from
May 23, 2017
Merged

Merge develop into master #2279

merged 13 commits into from
May 23, 2017

Conversation

luclu
Copy link
Contributor

@luclu luclu commented May 18, 2017

No description provided.

@evertonfraga
Copy link
Member

LGTM. will test during the day

@luclu
Copy link
Contributor Author

luclu commented May 18, 2017

Could you please also merge #2282 and update this branch thereafter?

@luclu
Copy link
Contributor Author

luclu commented May 21, 2017

@evertonfraga @alexvandesande I need some help in getting this one going :)

@frozeman
Copy link
Contributor

"Couldn't update "develop": Required status check "continuous-integration/travis-ci" is expected. At least one approved review is required by reviewers with write access."

@luclu
Copy link
Contributor Author

luclu commented May 22, 2017

Thank you Fabian, I restarted the build as some other tests hit their timeouts:

bildschirmfoto 2017-05-22 um 11 23 18

@frozeman
Copy link
Contributor

I still can't update the branch?

@luclu
Copy link
Contributor Author

luclu commented May 23, 2017

Me neither:

Couldn't update "develop": You're not authorized to push to this branch.

Perhaps this was due to the missing approval on this protected branch? (..would be some bug with github..)

@frozeman Could you please retry?
If it doesn't work thereafter, I will close and recreate this PR /and get in contact with github.

frozeman pushed a commit that referenced this pull request May 23, 2017
* [electron-builder] fix 'node_modules' copy (#2196)

copying errored due to symlinks in unnecessary 'electron' devDep package

* add windows code-signing (#2194)

* [yarn] update solc 0.4.11 (#2203)

*  [travis] also upload wallet on release build (#2208)

* [travis] update github publish (#2218)

* [travis] update github publish

* fix indent

* numeral.js: console.warn instead of console.error (#2154)

* Fixing backup typo

* [travis] fix github uploader (github API behaviour changed) (#2240)

* update geth 1.6.1 (#2277)

*  [spectron] increase some timeouts for travis (#2282)
@frozeman frozeman merged commit 825d636 into master May 23, 2017
@evertonfraga evertonfraga added this to the 0.8.10 milestone Jun 29, 2017
@lock
Copy link

lock bot commented Mar 31, 2018

This thread has been automatically locked because it has not had recent activity. Please open a new issue for related bugs and link to relevant comments in this thread.

@lock lock bot locked and limited conversation to collaborators Mar 31, 2018
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.

3 participants