From 134d956897a8d4a55793b5307878057834e4e2d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Tue, 8 Mar 2016 07:54:16 +0100
Subject: [PATCH 1/2] Bump VERSION to 5.0.17

---
 lib/open_project/github_integration/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/open_project/github_integration/version.rb b/lib/open_project/github_integration/version.rb
index a2bb8063ee..b713e8de65 100644
--- a/lib/open_project/github_integration/version.rb
+++ b/lib/open_project/github_integration/version.rb
@@ -14,6 +14,6 @@
 
 module OpenProject
   module GithubIntegration
-    VERSION = "5.0.16"
+    VERSION = "5.0.17"
   end
 end

From 78fc55a4e0fd5e739e1e8b4b28bb34d8a27565f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Fri, 1 Apr 2016 12:05:13 +0200
Subject: [PATCH 2/2] Add .travis.yml with core tests enabled

---
 .travis.yml | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..93d28d4675
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,115 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+# Travis configuration based on the respective OpenProject core configuration.
+# Everything save for the matrix section and additional `before_install`
+# instructions is copied and pasted from the core.
+
+language: ruby
+
+rvm:
+  - 2.2.3
+
+sudo: false
+
+cache:
+  - bundler: true
+  - directories:
+    - frontend/node_modules
+    - frontend/bower_components
+
+bundler_args: --without development production
+
+branches:
+  only:
+    - master
+    - dev
+    - /^(stable|release)\/.*$/
+
+env:
+  global:
+    - CI=true
+    - RAILS_ENV=test
+    - COVERAGE=true
+
+  matrix:
+    - "TEST_SUITE=plugins:spec      DB=mysql"
+    - "TEST_SUITE=plugins:cucumber  DB=mysql"
+
+    - "TEST_SUITE=npm"
+
+    - "TEST_SUITE=spec_legacy       DB=mysql     GROUP_SIZE=2  GROUP=1"
+    - "TEST_SUITE=spec_legacy       DB=mysql     GROUP_SIZE=2  GROUP=2"
+    - "TEST_SUITE=cucumber          DB=mysql     GROUP_SIZE=3  GROUP=1"
+    - "TEST_SUITE=cucumber          DB=mysql     GROUP_SIZE=3  GROUP=2"
+    - "TEST_SUITE=cucumber          DB=mysql     GROUP_SIZE=3  GROUP=3"
+    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=1"
+    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=2"
+    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=3"
+    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=4"
+    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=5"
+    - "TEST_SUITE=rspec             DB=mysql     GROUP_SIZE=6  GROUP=6"
+
+before_install:
+  # Custom plugin instructions follow.
+
+  # Move the plugin into a subfolder. The plugin-provided Gemfile.plugins
+  # must refer to this folder.
+  - mkdir -p plugins/this
+  - echo `ls -a | tail -n+3 | grep -v plugins` plugins/this/ | xargs mv
+
+  # Get OpenProject.
+  # Doing the fetch detour as you cannot clone into the current directory.
+  - git init
+  - git remote add openproject https://github.com/opf/openproject.git
+  - git fetch --depth=1 openproject
+  - git checkout openproject/$TRAVIS_BRANCH
+
+  # End of custom plugin instructions.
+
+  - "echo `firefox -v`"
+  - "export DISPLAY=:99.0"
+  - "/sbin/start-stop-daemon --start -v --pidfile ./tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1920x1080x16"
+  - "echo `xdpyinfo -display :99 | grep 'dimensions' | awk '{ print $2 }'`"
+  - travis_retry npm install
+
+  # We need phantomjs 2.0 to get tests passing
+  - mkdir travis-phantomjs
+  - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
+  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
+  - export PATH=$PWD/travis-phantomjs:$PATH
+
+before_script:
+  - sh script/ci_setup.sh $DB
+
+script:
+  - sh script/ci_runner.sh $TEST_SUITE $GROUP_SIZE $GROUP
+
+addons:
+  firefox: "45.0esr"
+  postgresql: "9.3"
\ No newline at end of file