Revert "Update Masterbranch before Demo (#375)" (#376)

This reverts commit d69bf25.
hpi-swt2 · Feb 6, 2019 · d085819 · d085819
1 parent d69bf25
commit d085819
Show file tree

Hide file tree

Showing 124 changed files with 952 additions and 3,058 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,10 +45,4 @@ coverage
 # Ignore locks
 .lock*
 
-config/credentials.yml.enc
-
-# Ignore environment variables
-/config/environment_variables.yml
-
-# Ignore Puppetscript folder
-/private
+config/credentials.yml.enc
diff --git a/.travis.yml b/.travis.yml
@@ -21,6 +21,3 @@ script:
 after_success:
  # https://docs.travis-ci.com/user/environment-variables/#default-environment-variables
  - curl --data "commit=$TRAVIS_COMMIT" --data "branch=$TRAVIS_BRANCH" --data "eventtype=$TRAVIS_EVENT_TYPE" http://hart-deploy.epic-hpi.de/
-
-env:
- - GIT_REPOSITORY_URL=test_repository_url GIT_REPOSITORY_NAME=test_repository_name GITHUB_USER_NAME=test_user_name GITHUB_USER_EMAIL=test_user_email
diff --git a/Gemfile b/Gemfile
@@ -62,9 +62,6 @@ gem 'omniauth_openid_connect'
 # Allow locks on database
 gem 'with_advisory_lock'
 
-# Ruby Git
-gem 'git'
-
 # Mina for deployment
 # Have a look in the tutorial:
 # https://github.com/lnikell/wiki/wiki/Deploy-rails-application-with-Mina,-Nginx-and-Puma