Merge branch 'master' into 'optimistic' (39e07385) · Commits · Goblin OGM / Goblin · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Goblin
- Activity
- Members
- Labels
- Issues
  3
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

39e07385

Commit 39e07385 authored 5 years ago by Jeffrey Phillips Freeman

💥

Downloads
- Plain Diff

Merge branch 'master' into 'optimistic'

# Conflicts:
#   goblin/fileio/graphson.py

parents 6450090f f08f30dc

Loading

Pipeline #209 passed with stage

in 1 minute and 55 seconds

Changes 20
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.cz-config.js 49 additions, 0 deletions

.cz-config.js
.cz.json 1 addition, 0 deletions

.cz.json
.editorconfig 14 additions, 0 deletions

.editorconfig
.gitattributes 4 additions, 0 deletions

.gitattributes
.gitlab-ci.yml 9 additions, 3 deletions

.gitlab-ci.yml
.travis.yml 0 additions, 26 deletions

.travis.yml
CHANGELOG.md 6 additions, 0 deletions

CHANGELOG.md
CODE_OF_CONDUCT.md 72 additions, 0 deletions

CODE_OF_CONDUCT.md
CONTRIBUTING.md 97 additions, 0 deletions

CONTRIBUTING.md
CONTRIBUTORS.md 4 additions, 0 deletions

CONTRIBUTORS.md
LICENSE 199 additions, 10 deletions

LICENSE
NEWS.txt 0 additions, 8 deletions

NEWS.txt
NOTICE 13 additions, 5 deletions

NOTICE
README.md 49 additions, 10 deletions

README.md
goblin/fileio/graphson.py 2 additions, 2 deletions

goblin/fileio/graphson.py
goblin/session.py 3 additions, 2 deletions

goblin/session.py
requirements.txt 12 additions, 10 deletions

requirements.txt
setup.cfg 2 additions, 1 deletion

setup.cfg
setup.py 2 additions, 2 deletions

setup.py
tests/test_graph.py 4 additions, 4 deletions

tests/test_graph.py

with 542 additions and 83 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment