Skip to content
This repository has been archived by the owner on Apr 16, 2024. It is now read-only.

Adapts changelog #848

Merged
merged 4 commits into from
Oct 12, 2018
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- Develop your code
- Commit and push in regular intervalls
- Run the tests locally
- Add a line to the [CHANGELOG.md](https://github.com/h-da/geli/blob/develop/CHANGELOG.md) under the "NEXT" section in the form `- a short text to describe [#123](https://github.com/h-da/geli/issues/123)`
- Add a line to the [CHANGELOG.md](https://github.com/geli-lms/geli/blob/develop/CHANGELOG.md) under the "NEXT" section in the form `- a short text to describe [#123](https://github.com/geli-lms/geli/issues/123)`
- Open a Pull-Request
- If CI/Coverage give their OK we can merge
- The PR gets merged to `develop`, which will push a new Docker-Image-Version with the tag `develop` and `latest`
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# +++ TRAVIS-FILE for https://github.com/h-da/geli +++
# +++ TRAVIS-FILE for https://github.com/geli-lms/geli +++

# required for chrome to install
dist: trusty
Expand Down
2 changes: 1 addition & 1 deletion .travis/apidoc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if [[ "$TRAVIS_BRANCH" == "master" ]] || [[ -n "$TRAVIS_TAG" ]]; then
exit 1
fi

GITHUB_URL="github.com/h-da/geli-docs.git"
GITHUB_URL="github.com/geli-lms/geli-docs.git"
GITHUB_FOLDER="geli-docs"
DOCU_SOURCE="apidocs"

Expand Down
4 changes: 2 additions & 2 deletions .travis/changelog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ echo

if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_BRANCH" == "develop" ]; then
echo "+ detected pull request from ($TRAVIS_PULL_REQUEST_BRANCH) to $TRAVIS_BRANCH"
curl --silent https://raw.githubusercontent.com/h-da/geli/$TRAVIS_BRANCH/CHANGELOG.md \
curl --silent https://raw.githubusercontent.com/geli-lms/geli/$TRAVIS_BRANCH/CHANGELOG.md \
| diff CHANGELOG.md - \
| grep -P '^< - .{8,}' - -q

Expand All @@ -27,7 +27,7 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_BRANCH" == "develop" ]; t
fi
elif [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
echo "+ detected pull request from ($TRAVIS_PULL_REQUEST_BRANCH) to $TRAVIS_BRANCH"
curl --silent https://raw.githubusercontent.com/h-da/geli/$TRAVIS_BRANCH/CHANGELOG.md \
curl --silent https://raw.githubusercontent.com/geli-lms/geli/$TRAVIS_BRANCH/CHANGELOG.md \
| diff CHANGELOG.md - \
| grep -P '^< ## \[\[\d{1,3}\.\d{1,3}\.\d{1,3}\].*\] - \d{4}-\d{2}-\d{2} - .{10,}' - -q

Expand Down
2 changes: 1 addition & 1 deletion .travis/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/utetrapp/geli"
"url": "https://github.com/geli-lms/geli"
},
"description": "These dependencies are only for the travis after_script stuff",
"license": "GPL-3.0",
Expand Down
260 changes: 130 additions & 130 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "geli-api",
"version": "0.7.0",
"license": "GPL-3.0",
"repository": "h-da/geli",
"repository": "geli-lms/geli",
"description": "This is the API-Package.json for geli.",
"main": "build/index.js",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion app/webFrontend/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "geli-web-frontend",
"description": "This is the WebFronted-Package.json for geli.",
"repository": "h-da/geli",
"repository": "geli-lms/geli",
"version": "0.7.0",
"license": "GPL-3.0",
"scripts": {
Expand Down